diff --git a/browser/app/js/__tests__/App.test.js b/browser/app/js/__tests__/App.test.js
index 14ec5cedc..842f4e145 100644
--- a/browser/app/js/__tests__/App.test.js
+++ b/browser/app/js/__tests__/App.test.js
@@ -31,7 +31,7 @@ describe("App", () => {
     const wrapper = mount(
       <MemoryRouter initialEntries={["/login"]}>
         <App />
-      </MemoryRouter>,
+      </MemoryRouter>
     )
     expect(wrapper.text()).toBe("Login")
   })
@@ -40,7 +40,7 @@ describe("App", () => {
     const wrapper = mount(
       <MemoryRouter initialEntries={["/"]}>
         <App />
-      </MemoryRouter>,
+      </MemoryRouter>
     )
     expect(wrapper.text()).toBe("Browser")
   })
@@ -49,7 +49,7 @@ describe("App", () => {
     const wrapper = mount(
       <MemoryRouter initialEntries={["/bucket"]}>
         <App />
-      </MemoryRouter>,
+      </MemoryRouter>
     )
     expect(wrapper.text()).toBe("Browser")
   })
@@ -58,7 +58,7 @@ describe("App", () => {
     const wrapper = mount(
       <MemoryRouter initialEntries={["/bucket/a/b/c"]}>
         <App />
-      </MemoryRouter>,
+      </MemoryRouter>
     )
     expect(wrapper.text()).toBe("Browser")
   })
diff --git a/browser/app/js/__tests__/jsonrpc-test.js b/browser/app/js/__tests__/jsonrpc-test.js
index a2e96dd93..30d15b7de 100644
--- a/browser/app/js/__tests__/jsonrpc-test.js
+++ b/browser/app/js/__tests__/jsonrpc-test.js
@@ -21,7 +21,7 @@ describe("jsonrpc", () => {
     try {
       let jsonRPC = new JSONrpc({
         endpoint: "htt://localhost:9000",
-        namespace: "Test",
+        namespace: "Test"
       })
     } catch (e) {
       done()
@@ -30,7 +30,7 @@ describe("jsonrpc", () => {
   it("should succeed with valid endpoint", () => {
     let jsonRPC = new JSONrpc({
       endpoint: "http://localhost:9000/webrpc",
-      namespace: "Test",
+      namespace: "Test"
     })
     expect(jsonRPC.version).toEqual("2.0")
     expect(jsonRPC.host).toEqual("localhost")
diff --git a/browser/app/js/alert/AlertContainer.js b/browser/app/js/alert/AlertContainer.js
index d3202e420..a36e9910d 100644
--- a/browser/app/js/alert/AlertContainer.js
+++ b/browser/app/js/alert/AlertContainer.js
@@ -28,13 +28,13 @@ export const AlertContainer = ({ alert, clearAlert }) => {
 
 const mapStateToProps = state => {
   return {
-    alert: state.alert,
+    alert: state.alert
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    clearAlert: () => dispatch(alertActions.clear()),
+    clearAlert: () => dispatch(alertActions.clear())
   }
 }
 
diff --git a/browser/app/js/alert/__tests___/Alert.test.js b/browser/app/js/alert/__tests___/Alert.test.js
index bcedcaa7f..b6a9e6268 100644
--- a/browser/app/js/alert/__tests___/Alert.test.js
+++ b/browser/app/js/alert/__tests___/Alert.test.js
@@ -26,10 +26,10 @@ describe("Alert", () => {
   it("should call onDismiss when close button is clicked", () => {
     const onDismiss = jest.fn()
     const wrapper = mount(
-      <Alert show={true} type="danger" message="test" onDismiss={onDismiss} />,
+      <Alert show={true} type="danger" message="test" onDismiss={onDismiss} />
     )
-    wrapper.find("button").simulate("click", {
-      preventDefault: jest.fn(),
+    wrapper.find("i").simulate("click", {
+      preventDefault: jest.fn()
     })
     expect(onDismiss).toHaveBeenCalled()
   })
diff --git a/browser/app/js/alert/__tests___/AlertContainer.test.js b/browser/app/js/alert/__tests___/AlertContainer.test.js
index f748e1915..d41bc6f02 100644
--- a/browser/app/js/alert/__tests___/AlertContainer.test.js
+++ b/browser/app/js/alert/__tests___/AlertContainer.test.js
@@ -21,15 +21,13 @@ import { AlertContainer } from "../AlertContainer"
 describe("Alert", () => {
   it("should render without crashing", () => {
     shallow(
-      <AlertContainer
-        alert={{ show: true, type: "danger", message: "Test" }}
-      />,
+      <AlertContainer alert={{ show: true, type: "danger", message: "Test" }} />
     )
   })
 
   it("should render nothing if message is empty", () => {
     const wrapper = shallow(
-      <AlertContainer alert={{ show: true, type: "danger", message: "" }} />,
+      <AlertContainer alert={{ show: true, type: "danger", message: "" }} />
     )
     expect(wrapper.find("Alert").length).toBe(0)
   })
diff --git a/browser/app/js/alert/__tests___/actions.test.js b/browser/app/js/alert/__tests___/actions.test.js
index b06eed57a..4dc616a3e 100644
--- a/browser/app/js/alert/__tests___/actions.test.js
+++ b/browser/app/js/alert/__tests___/actions.test.js
@@ -32,15 +32,15 @@ describe("Alert actions", () => {
         alert: {
           id: 0,
           message: "Test alert",
-          type: "danger",
-        },
-      },
+          type: "danger"
+        }
+      }
     ]
     store.dispatch(
       actionsAlert.set({
         message: "Test alert",
-        type: "danger",
-      }),
+        type: "danger"
+      })
     )
     const actions = store.getActions()
     expect(actions).toEqual(expectedActions)
@@ -53,20 +53,20 @@ describe("Alert actions", () => {
         type: "alert/SET",
         alert: {
           id: 1,
-          message: "Test alert",
-        },
+          message: "Test alert"
+        }
       },
       {
         type: "alert/CLEAR",
         alert: {
-          id: 1,
-        },
-      },
+          id: 1
+        }
+      }
     ]
     store.dispatch(
       actionsAlert.set({
-        message: "Test alert",
-      }),
+        message: "Test alert"
+      })
     )
     jest.runAllTimers()
     const actions = store.getActions()
@@ -77,8 +77,8 @@ describe("Alert actions", () => {
     const store = mockStore()
     const expectedActions = [
       {
-        type: "alert/CLEAR",
-      },
+        type: "alert/CLEAR"
+      }
     ]
     store.dispatch(actionsAlert.clear())
     const actions = store.getActions()
diff --git a/browser/app/js/alert/__tests___/reducer.test.js b/browser/app/js/alert/__tests___/reducer.test.js
index a875228b8..69099710b 100644
--- a/browser/app/js/alert/__tests___/reducer.test.js
+++ b/browser/app/js/alert/__tests___/reducer.test.js
@@ -21,7 +21,7 @@ describe("alert reducer", () => {
   it("should return the initial state", () => {
     expect(reducer(undefined, {})).toEqual({
       show: false,
-      type: "danger",
+      type: "danger"
     })
   })
 
@@ -32,14 +32,14 @@ describe("alert reducer", () => {
         alert: {
           id: 1,
           type: "danger",
-          message: "Test message",
-        },
-      }),
+          message: "Test message"
+        }
+      })
     ).toEqual({
       show: true,
       id: 1,
       type: "danger",
-      message: "Test message",
+      message: "Test message"
     })
   })
 
@@ -49,15 +49,15 @@ describe("alert reducer", () => {
         {
           show: true,
           type: "danger",
-          message: "Test message",
+          message: "Test message"
         },
         {
-          type: actionsAlert.CLEAR,
-        },
-      ),
+          type: actionsAlert.CLEAR
+        }
+      )
     ).toEqual({
       show: false,
-      type: "danger",
+      type: "danger"
     })
   })
 
@@ -68,18 +68,18 @@ describe("alert reducer", () => {
           show: true,
           id: 1,
           type: "danger",
-          message: "Test message",
+          message: "Test message"
         },
         {
           type: actionsAlert.CLEAR,
           alert: {
-            id: 1,
-          },
-        },
-      ),
+            id: 1
+          }
+        }
+      )
     ).toEqual({
       show: false,
-      type: "danger",
+      type: "danger"
     })
   })
 
@@ -90,20 +90,20 @@ describe("alert reducer", () => {
           show: true,
           id: 1,
           type: "danger",
-          message: "Test message",
+          message: "Test message"
         },
         {
           type: actionsAlert.CLEAR,
           alert: {
-            id: 2,
-          },
-        },
-      ),
+            id: 2
+          }
+        }
+      )
     ).toEqual({
       show: true,
       id: 1,
       type: "danger",
-      message: "Test message",
+      message: "Test message"
     })
   })
 })
diff --git a/browser/app/js/alert/actions.js b/browser/app/js/alert/actions.js
index 17a518234..6afd182ed 100644
--- a/browser/app/js/alert/actions.js
+++ b/browser/app/js/alert/actions.js
@@ -27,22 +27,22 @@ export const set = alert => {
         dispatch({
           type: CLEAR,
           alert: {
-            id,
-          },
+            id
+          }
         })
       }, 5000)
     }
     dispatch({
       type: SET,
       alert: Object.assign({}, alert, {
-        id,
-      }),
+        id
+      })
     })
   }
 }
 
 export const clear = () => {
   return {
-    type: CLEAR,
+    type: CLEAR
   }
 }
diff --git a/browser/app/js/alert/reducer.js b/browser/app/js/alert/reducer.js
index 04ff594ea..3bcd4fddb 100644
--- a/browser/app/js/alert/reducer.js
+++ b/browser/app/js/alert/reducer.js
@@ -18,7 +18,7 @@ import * as actionsAlert from "./actions"
 
 const initialState = {
   show: false,
-  type: "danger",
+  type: "danger"
 }
 export default (state = initialState, action) => {
   switch (action.type) {
@@ -27,7 +27,7 @@ export default (state = initialState, action) => {
         show: true,
         id: action.alert.id,
         type: action.alert.type,
-        message: action.alert.message,
+        message: action.alert.message
       }
     case actionsAlert.CLEAR:
       if (action.alert && action.alert.id != state.id) {
diff --git a/browser/app/js/browser/BrowserDropdown.js b/browser/app/js/browser/BrowserDropdown.js
index defb04d0d..1676d4d1f 100644
--- a/browser/app/js/browser/BrowserDropdown.js
+++ b/browser/app/js/browser/BrowserDropdown.js
@@ -28,29 +28,29 @@ export class BrowserDropdown extends React.Component {
     super(props)
     this.state = {
       showAboutModal: false,
-      showChangePasswordModal: false,
+      showChangePasswordModal: false
     }
   }
   showAbout(e) {
     e.preventDefault()
     this.setState({
-      showAboutModal: true,
+      showAboutModal: true
     })
   }
   hideAbout() {
     this.setState({
-      showAboutModal: false,
+      showAboutModal: false
     })
   }
   showChangePassword(e) {
     e.preventDefault()
     this.setState({
-      showChangePasswordModal: true,
+      showChangePasswordModal: true
     })
   }
   hideChangePassword() {
     this.setState({
-      showChangePasswordModal: false,
+      showChangePasswordModal: false
     })
   }
   componentDidMount() {
@@ -142,13 +142,13 @@ export class BrowserDropdown extends React.Component {
 
 const mapStateToProps = state => {
   return {
-    serverInfo: state.browser.serverInfo,
+    serverInfo: state.browser.serverInfo
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    fetchServerInfo: () => dispatch(browserActions.fetchServerInfo()),
+    fetchServerInfo: () => dispatch(browserActions.fetchServerInfo())
   }
 }
 
diff --git a/browser/app/js/browser/ChangePasswordModal.js b/browser/app/js/browser/ChangePasswordModal.js
index c9d0aaef9..d6a6584dc 100644
--- a/browser/app/js/browser/ChangePasswordModal.js
+++ b/browser/app/js/browser/ChangePasswordModal.js
@@ -24,7 +24,7 @@ import {
   Modal,
   ModalBody,
   ModalHeader,
-  OverlayTrigger,
+  OverlayTrigger
 } from "react-bootstrap"
 
 export class ChangePasswordModal extends React.Component {
@@ -33,7 +33,7 @@ export class ChangePasswordModal extends React.Component {
     this.state = {
       accessKey: "",
       secretKey: "",
-      keysReadOnly: false,
+      keysReadOnly: false
     }
   }
   // When its shown, it loads the access key and secret key.
@@ -45,13 +45,13 @@ export class ChangePasswordModal extends React.Component {
       this.setState({
         accessKey: "xxxxxxxxx",
         secretKey: "xxxxxxxxx",
-        keysReadOnly: true,
+        keysReadOnly: true
       })
     } else {
       web.GetAuth().then(data => {
         this.setState({
           accessKey: data.accessKey,
-          secretKey: data.secretKey,
+          secretKey: data.secretKey
         })
       })
     }
@@ -60,19 +60,19 @@ export class ChangePasswordModal extends React.Component {
   // Handle field changes from inside the modal.
   accessKeyChange(e) {
     this.setState({
-      accessKey: e.target.value,
+      accessKey: e.target.value
     })
   }
 
   secretKeyChange(e) {
     this.setState({
-      secretKey: e.target.value,
+      secretKey: e.target.value
     })
   }
 
   secretKeyVisible(secretKeyVisible) {
     this.setState({
-      secretKeyVisible,
+      secretKeyVisible
     })
   }
 
@@ -84,18 +84,18 @@ export class ChangePasswordModal extends React.Component {
     web
       .SetAuth({
         accessKey,
-        secretKey,
+        secretKey
       })
       .then(data => {
         showAlert({
           type: "success",
-          message: "Changed credentials",
+          message: "Changed credentials"
         })
       })
       .catch(err => {
         showAlert({
           type: "danger",
-          message: err.message,
+          message: err.message
         })
       })
   }
@@ -105,7 +105,7 @@ export class ChangePasswordModal extends React.Component {
       this.setState({
         accessKey: data.accessKey,
         secretKey: data.secretKey,
-        secretKeyVisible: true,
+        secretKeyVisible: true
       })
     })
   }
@@ -136,7 +136,7 @@ export class ChangePasswordModal extends React.Component {
             <input
               type={this.state.secretKeyVisible ? "text" : "password"}
               value={this.state.secretKey}
-              onChange={this.accessKeyChange.bind(this)}
+              onChange={this.secretKeyChange.bind(this)}
               id="secretKey"
               className="form-group__field"
               name="secretKey"
@@ -148,7 +148,7 @@ export class ChangePasswordModal extends React.Component {
             <i
               onClick={this.secretKeyVisible.bind(
                 this,
-                !this.state.secretKeyVisible,
+                !this.state.secretKeyVisible
               )}
               className={
                 "form-group__addon zmdi " +
@@ -191,13 +191,13 @@ export class ChangePasswordModal extends React.Component {
 
 const mapStateToProps = state => {
   return {
-    serverInfo: state.browser.serverInfo,
+    serverInfo: state.browser.serverInfo
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    showAlert: alert => dispatch(alertActions.set(alert)),
+    showAlert: alert => dispatch(alertActions.set(alert))
   }
 }
 
diff --git a/browser/app/js/browser/ConfirmModal.js b/browser/app/js/browser/ConfirmModal.js
index 9e0236725..75bb89a75 100644
--- a/browser/app/js/browser/ConfirmModal.js
+++ b/browser/app/js/browser/ConfirmModal.js
@@ -26,7 +26,7 @@ let ConfirmModal = ({
   cancelText,
   okHandler,
   cancelHandler,
-  show,
+  show
 }) => {
   return (
     <Modal
diff --git a/browser/app/js/browser/Header.js b/browser/app/js/browser/Header.js
index 0de72a83a..223c8f6c3 100644
--- a/browser/app/js/browser/Header.js
+++ b/browser/app/js/browser/Header.js
@@ -16,12 +16,12 @@
 
 import React from "react"
 import Path from "../objects/Path"
-import ObjectsBulkActions from "../objects/ObjectsBulkActions"
+import Toolbar from "../objects/Toolbar"
 
 export const Header = () => {
   return (
     <header className="header">
-      <ObjectsBulkActions />
+      <Toolbar />
       <Path />
     </header>
   )
diff --git a/browser/app/js/browser/Login.js b/browser/app/js/browser/Login.js
index 64ba57621..f9f758ce5 100644
--- a/browser/app/js/browser/Login.js
+++ b/browser/app/js/browser/Login.js
@@ -40,7 +40,7 @@ export class Login extends React.Component {
     web
       .Login({
         username: document.getElementById("accessKey").value,
-        password: document.getElementById("secretKey").value,
+        password: document.getElementById("secretKey").value
       })
       .then(res => {
         history.push("/")
@@ -114,10 +114,10 @@ const mapDispatchToProps = dispatch => {
       dispatch(
         actionsAlert.set({
           type: type,
-          message: message,
-        }),
+          message: message
+        })
       ),
-    clearAlert: () => dispatch(actionsAlert.clear()),
+    clearAlert: () => dispatch(actionsAlert.clear())
   }
 }
 
diff --git a/browser/app/js/browser/MainActions.js b/browser/app/js/browser/MainActions.js
index 3354b2f64..ee1d44a64 100644
--- a/browser/app/js/browser/MainActions.js
+++ b/browser/app/js/browser/MainActions.js
@@ -25,7 +25,7 @@ import { getPrefixWritable } from "../objects/selectors"
 export const MainActions = ({
   prefixWritable,
   uploadFile,
-  showMakeBucketModal,
+  showMakeBucketModal
 }) => {
   const uploadTooltip = <Tooltip id="tooltip-upload-file">Upload file</Tooltip>
   const makeBucketTooltip = (
@@ -89,14 +89,14 @@ export const MainActions = ({
 
 const mapStateToProps = state => {
   return {
-    prefixWritable: getPrefixWritable(state),
+    prefixWritable: getPrefixWritable(state)
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
     uploadFile: file => dispatch(uploadsActions.uploadFile(file)),
-    showMakeBucketModal: () => dispatch(actionsBuckets.showMakeBucketModal()),
+    showMakeBucketModal: () => dispatch(actionsBuckets.showMakeBucketModal())
   }
 }
 
diff --git a/browser/app/js/browser/SideBar.js b/browser/app/js/browser/SideBar.js
index 9250f544e..fc3eb88c9 100644
--- a/browser/app/js/browser/SideBar.js
+++ b/browser/app/js/browser/SideBar.js
@@ -30,7 +30,7 @@ export const SideBar = ({ sidebarOpen }) => {
     <aside
       className={classNames({
         sidebar: true,
-        "sidebar--toggled": sidebarOpen,
+        "sidebar--toggled": sidebarOpen
       })}
     >
       <div className="sidebar__inner">
@@ -53,13 +53,13 @@ export const SideBar = ({ sidebarOpen }) => {
 
 const mapStateToProps = state => {
   return {
-    sidebarOpen: state.browser.sidebarOpen,
+    sidebarOpen: state.browser.sidebarOpen
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    toggleSidebar: () => dispatch(actionsCommon.toggleSidebar()),
+    toggleSidebar: () => dispatch(actionsCommon.toggleSidebar())
   }
 }
 
diff --git a/browser/app/js/browser/SidebarBackdrop.js b/browser/app/js/browser/SidebarBackdrop.js
index 08ac4db7a..0775e3817 100644
--- a/browser/app/js/browser/SidebarBackdrop.js
+++ b/browser/app/js/browser/SidebarBackdrop.js
@@ -30,13 +30,13 @@ export const SidebarBackdrop = ({ sidebarOpen, toggleSidebar }) => (
 
 const mapStateToProps = state => {
   return {
-    sidebarOpen: state.browser.sidebarOpen,
+    sidebarOpen: state.browser.sidebarOpen
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    toggleSidebar: () => dispatch(actionsCommon.toggleSidebar()),
+    toggleSidebar: () => dispatch(actionsCommon.toggleSidebar())
   }
 }
 
diff --git a/browser/app/js/browser/SidebarToggle.js b/browser/app/js/browser/SidebarToggle.js
index 6a8cff0a0..13aa4bc76 100644
--- a/browser/app/js/browser/SidebarToggle.js
+++ b/browser/app/js/browser/SidebarToggle.js
@@ -30,13 +30,13 @@ export const SidebarToggle = ({ sidebarOpen, toggleSidebar }) => (
 
 const mapStateToProps = state => {
   return {
-    sidebarOpen: state.browser.sidebarOpen,
+    sidebarOpen: state.browser.sidebarOpen
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    toggleSidebar: () => dispatch(actionsCommon.toggleSidebar()),
+    toggleSidebar: () => dispatch(actionsCommon.toggleSidebar())
   }
 }
 
diff --git a/browser/app/js/browser/StorageInfo.js b/browser/app/js/browser/StorageInfo.js
index 2415581ca..b348e9a2b 100644
--- a/browser/app/js/browser/StorageInfo.js
+++ b/browser/app/js/browser/StorageInfo.js
@@ -44,13 +44,13 @@ export class StorageInfo extends React.Component {
 
 const mapStateToProps = state => {
   return {
-    storageInfo: state.browser.storageInfo,
+    storageInfo: state.browser.storageInfo
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    fetchStorageInfo: () => dispatch(actionsCommon.fetchStorageInfo()),
+    fetchStorageInfo: () => dispatch(actionsCommon.fetchStorageInfo())
   }
 }
 
diff --git a/browser/app/js/browser/__tests__/AboutModal.test.js b/browser/app/js/browser/__tests__/AboutModal.test.js
index 11fbaaee9..ef7c5020c 100644
--- a/browser/app/js/browser/__tests__/AboutModal.test.js
+++ b/browser/app/js/browser/__tests__/AboutModal.test.js
@@ -23,7 +23,7 @@ describe("AboutModal", () => {
     version: "test",
     memory: "test",
     platform: "test",
-    runtime: "test",
+    runtime: "test"
   }
 
   it("should render without crashing", () => {
@@ -33,9 +33,9 @@ describe("AboutModal", () => {
   it("should call hideAbout when close button is clicked", () => {
     const hideAbout = jest.fn()
     const wrapper = shallow(
-      <AboutModal serverInfo={serverInfo} hideAbout={hideAbout} />,
+      <AboutModal serverInfo={serverInfo} hideAbout={hideAbout} />
     )
-    wrapper.find("button").simulate("click")
+    wrapper.find("i").simulate("click")
     expect(hideAbout).toHaveBeenCalled()
   })
 })
diff --git a/browser/app/js/browser/__tests__/BrowserDropdown.test.js b/browser/app/js/browser/__tests__/BrowserDropdown.test.js
index f5e0496fb..fb1fb773f 100644
--- a/browser/app/js/browser/__tests__/BrowserDropdown.test.js
+++ b/browser/app/js/browser/__tests__/BrowserDropdown.test.js
@@ -23,12 +23,12 @@ describe("BrowserDropdown", () => {
     version: "test",
     memory: "test",
     platform: "test",
-    runtime: "test",
+    runtime: "test"
   }
 
   it("should render without crashing", () => {
     shallow(
-      <BrowserDropdown serverInfo={serverInfo} fetchServerInfo={jest.fn()} />,
+      <BrowserDropdown serverInfo={serverInfo} fetchServerInfo={jest.fn()} />
     )
   })
 
@@ -38,17 +38,17 @@ describe("BrowserDropdown", () => {
       <BrowserDropdown
         serverInfo={serverInfo}
         fetchServerInfo={fetchServerInfo}
-      />,
+      />
     )
     expect(fetchServerInfo).toHaveBeenCalled()
   })
 
   it("should show AboutModal when About link is clicked", () => {
     const wrapper = shallow(
-      <BrowserDropdown serverInfo={serverInfo} fetchServerInfo={jest.fn()} />,
+      <BrowserDropdown serverInfo={serverInfo} fetchServerInfo={jest.fn()} />
     )
     wrapper.find("#show-about").simulate("click", {
-      preventDefault: jest.fn(),
+      preventDefault: jest.fn()
     })
     wrapper.update()
     expect(wrapper.state("showAboutModal")).toBeTruthy()
@@ -57,10 +57,10 @@ describe("BrowserDropdown", () => {
 
   it("should logout and redirect to /login when logout is clicked", () => {
     const wrapper = shallow(
-      <BrowserDropdown serverInfo={serverInfo} fetchServerInfo={jest.fn()} />,
+      <BrowserDropdown serverInfo={serverInfo} fetchServerInfo={jest.fn()} />
     )
     wrapper.find("#logout").simulate("click", {
-      preventDefault: jest.fn(),
+      preventDefault: jest.fn()
     })
     expect(window.location.pathname.endsWith("/login")).toBeTruthy()
   })
diff --git a/browser/app/js/browser/__tests__/ChangePasswordModal.test.js b/browser/app/js/browser/__tests__/ChangePasswordModal.test.js
index bca6b653f..f14048b61 100644
--- a/browser/app/js/browser/__tests__/ChangePasswordModal.test.js
+++ b/browser/app/js/browser/__tests__/ChangePasswordModal.test.js
@@ -22,13 +22,13 @@ jest.mock("../../web", () => ({
   GetAuth: jest.fn(() => {
     return Promise.resolve({
       accessKey: "test1",
-      secretKey: "test2",
+      secretKey: "test2"
     })
   }),
   GenerateAuth: jest.fn(() => {
     return Promise.resolve({
       accessKey: "gen1",
-      secretKey: "gen2",
+      secretKey: "gen2"
     })
   }),
   SetAuth: jest.fn(({ accessKey, secretKey }) => {
@@ -36,10 +36,10 @@ jest.mock("../../web", () => ({
       return Promise.resolve({})
     } else {
       return Promise.reject({
-        message: "Error",
+        message: "Error"
       })
     }
-  }),
+  })
 }))
 
 describe("ChangePasswordModal", () => {
@@ -49,8 +49,8 @@ describe("ChangePasswordModal", () => {
     platform: "test",
     runtime: "test",
     info: {
-      isEnvCreds: false,
-    },
+      isEnvCreds: false
+    }
   }
 
   it("should render without crashing", () => {
@@ -69,8 +69,8 @@ describe("ChangePasswordModal", () => {
     const newServerInfo = {
       ...serverInfo,
       info: {
-        isEnvCreds: true,
-      },
+        isEnvCreds: true
+      }
     }
     const wrapper = shallow(<ChangePasswordModal serverInfo={newServerInfo} />)
     expect(wrapper.state("accessKey")).toBe("xxxxxxxxx")
@@ -93,23 +93,23 @@ describe("ChangePasswordModal", () => {
   it("should update accessKey and secretKey when Update button is clicked", () => {
     const showAlert = jest.fn()
     const wrapper = shallow(
-      <ChangePasswordModal serverInfo={serverInfo} showAlert={showAlert} />,
+      <ChangePasswordModal serverInfo={serverInfo} showAlert={showAlert} />
     )
     wrapper.find("#accessKey").simulate("change", {
       target: {
-        value: "test3",
-      },
+        value: "test3"
+      }
     })
     wrapper.find("#secretKey").simulate("change", {
       target: {
-        value: "test4",
-      },
+        value: "test4"
+      }
     })
     wrapper.find("#update-keys").simulate("click")
     setImmediate(() => {
       expect(showAlert).toHaveBeenCalledWith({
         type: "success",
-        message: "Changed credentials",
+        message: "Changed credentials"
       })
     })
   })
@@ -120,7 +120,7 @@ describe("ChangePasswordModal", () => {
       <ChangePasswordModal
         serverInfo={serverInfo}
         hideChangePassword={hideChangePassword}
-      />,
+      />
     )
     wrapper.find("#cancel-change-password").simulate("click")
     expect(hideChangePassword).toHaveBeenCalled()
diff --git a/browser/app/js/browser/__tests__/Header.test.js b/browser/app/js/browser/__tests__/Header.test.js
index f313074a4..a48357361 100644
--- a/browser/app/js/browser/__tests__/Header.test.js
+++ b/browser/app/js/browser/__tests__/Header.test.js
@@ -18,25 +18,8 @@ import React from "react"
 import { shallow } from "enzyme"
 import Header from "../Header"
 
-jest.mock("../../web", () => ({
-  LoggedIn: jest
-    .fn(() => true)
-    .mockReturnValueOnce(true)
-    .mockReturnValueOnce(false),
-}))
 describe("Header", () => {
   it("should render without crashing", () => {
     shallow(<Header />)
   })
-
-  it("should render Login button when the user has not LoggedIn", () => {
-    const wrapper = shallow(<Header />)
-    expect(wrapper.find("a").text()).toBe("Login")
-  })
-
-  it("should render StorageInfo and BrowserDropdown when the user has LoggedIn", () => {
-    const wrapper = shallow(<Header />)
-    expect(wrapper.find("Connect(BrowserDropdown)").length).toBe(1)
-    expect(wrapper.find("Connect(StorageInfo)").length).toBe(1)
-  })
 })
diff --git a/browser/app/js/browser/__tests__/Login.test.js b/browser/app/js/browser/__tests__/Login.test.js
index 6b0edee84..a7d8f731e 100644
--- a/browser/app/js/browser/__tests__/Login.test.js
+++ b/browser/app/js/browser/__tests__/Login.test.js
@@ -23,10 +23,10 @@ jest.mock("../../web", () => ({
   Login: jest.fn(() => {
     return Promise.resolve({
       token: "test",
-      uiVersion: "2018-02-01T01:17:47Z",
+      uiVersion: "2018-02-01T01:17:47Z"
     })
   }),
-  LoggedIn: jest.fn(),
+  LoggedIn: jest.fn()
 }))
 
 describe("Login", () => {
@@ -41,7 +41,7 @@ describe("Login", () => {
         alert={{ show: false, type: "danger" }}
         showAlert={showAlertMock}
         clearAlert={clearAlertMock}
-      />,
+      />
     )
   })
 
@@ -54,8 +54,8 @@ describe("Login", () => {
         clearAlert={clearAlertMock}
       />,
       {
-        attachTo: document.body,
-      },
+        attachTo: document.body
+      }
     )
     expect(document.body.classList.contains("is-guest")).toBeTruthy()
   })
@@ -69,14 +69,14 @@ describe("Login", () => {
         clearAlert={clearAlertMock}
       />,
       {
-        attachTo: document.body,
-      },
+        attachTo: document.body
+      }
     )
     // case where both keys are empty - displays the second warning
     wrapper.find("form").simulate("submit")
     expect(showAlertMock).toHaveBeenCalledWith(
       "danger",
-      "Secret Key cannot be empty",
+      "Secret Key cannot be empty"
     )
 
     // case where access key is empty
@@ -84,7 +84,7 @@ describe("Login", () => {
     wrapper.find("form").simulate("submit")
     expect(showAlertMock).toHaveBeenCalledWith(
       "danger",
-      "Access Key cannot be empty",
+      "Access Key cannot be empty"
     )
 
     // case where secret key is empty
@@ -92,7 +92,7 @@ describe("Login", () => {
     wrapper.find("form").simulate("submit")
     expect(showAlertMock).toHaveBeenCalledWith(
       "danger",
-      "Secret Key cannot be empty",
+      "Secret Key cannot be empty"
     )
   })
 
@@ -105,15 +105,15 @@ describe("Login", () => {
         clearAlert={clearAlertMock}
       />,
       {
-        attachTo: document.body,
-      },
+        attachTo: document.body
+      }
     )
     document.getElementById("accessKey").value = "accessKey"
     document.getElementById("secretKey").value = "secretKey"
     wrapper.find("form").simulate("submit")
     expect(web.Login).toHaveBeenCalledWith({
       username: "accessKey",
-      password: "secretKey",
+      password: "secretKey"
     })
   })
 })
diff --git a/browser/app/js/browser/__tests__/MainActions.test.js b/browser/app/js/browser/__tests__/MainActions.test.js
index 236b136a7..38e3153f9 100644
--- a/browser/app/js/browser/__tests__/MainActions.test.js
+++ b/browser/app/js/browser/__tests__/MainActions.test.js
@@ -23,7 +23,7 @@ jest.mock("../../web", () => ({
     .fn(() => true)
     .mockReturnValueOnce(true)
     .mockReturnValueOnce(false)
-    .mockReturnValueOnce(false),
+    .mockReturnValueOnce(false)
 }))
 
 describe("MainActions", () => {
@@ -52,10 +52,10 @@ describe("MainActions", () => {
   it("should call showMakeBucketModal when create bucket icon is clicked", () => {
     const showMakeBucketModal = jest.fn()
     const wrapper = shallow(
-      <MainActions showMakeBucketModal={showMakeBucketModal} />,
+      <MainActions showMakeBucketModal={showMakeBucketModal} />
     )
     wrapper.find("#show-make-bucket").simulate("click", {
-      preventDefault: jest.fn(),
+      preventDefault: jest.fn()
     })
     expect(showMakeBucketModal).toHaveBeenCalled()
   })
@@ -64,13 +64,13 @@ describe("MainActions", () => {
     const uploadFile = jest.fn()
     const wrapper = shallow(<MainActions uploadFile={uploadFile} />)
     const file = new Blob(["file content"], {
-      type: "text/plain",
+      type: "text/plain"
     })
     wrapper.find("#file-input").simulate("change", {
       preventDefault: jest.fn(),
       target: {
-        files: [file],
-      },
+        files: [file]
+      }
     })
     expect(uploadFile).toHaveBeenCalledWith(file)
   })
diff --git a/browser/app/js/browser/__tests__/SideBar.test.js b/browser/app/js/browser/__tests__/SideBar.test.js
index bd02b92a6..13b619a88 100644
--- a/browser/app/js/browser/__tests__/SideBar.test.js
+++ b/browser/app/js/browser/__tests__/SideBar.test.js
@@ -19,7 +19,7 @@ import { shallow } from "enzyme"
 import { SideBar } from "../SideBar"
 
 jest.mock("../../web", () => ({
-  LoggedIn: jest.fn(() => false).mockReturnValueOnce(true),
+  LoggedIn: jest.fn(() => false).mockReturnValueOnce(true)
 }))
 
 describe("SideBar", () => {
@@ -31,13 +31,4 @@ describe("SideBar", () => {
     const wrapper = shallow(<SideBar />)
     expect(wrapper.find("Connect(BucketSearch)").length).toBe(0)
   })
-
-  it("should call clickOutside when the user clicks outside the sidebar", () => {
-    const clickOutside = jest.fn()
-    const wrapper = shallow(<SideBar clickOutside={clickOutside} />)
-    wrapper.simulate("clickOut", {
-      preventDefault: jest.fn(),
-    })
-    expect(clickOutside).toHaveBeenCalled()
-  })
 })
diff --git a/browser/app/js/browser/__tests__/MobileHeader.test.js b/browser/app/js/browser/__tests__/SidebarToggle.test.js
similarity index 76%
rename from browser/app/js/browser/__tests__/MobileHeader.test.js
rename to browser/app/js/browser/__tests__/SidebarToggle.test.js
index 6bd04ae2f..0576e4a32 100644
--- a/browser/app/js/browser/__tests__/MobileHeader.test.js
+++ b/browser/app/js/browser/__tests__/SidebarToggle.test.js
@@ -16,20 +16,20 @@
 
 import React from "react"
 import { shallow } from "enzyme"
-import { MobileHeader } from "../MobileHeader"
+import { SidebarToggle } from "../SidebarToggle"
 
-describe("Bucket", () => {
+describe("SidebarToggle", () => {
   it("should render without crashing", () => {
-    shallow(<MobileHeader sidebarOpen={false} />)
+    shallow(<SidebarToggle sidebarOpen={false} />)
   })
 
   it("should toggleSidebar when trigger is clicked", () => {
     const toggleSidebar = jest.fn()
     const wrapper = shallow(
-      <MobileHeader sidebarOpen={false} toggleSidebar={toggleSidebar} />,
+      <SidebarToggle sidebarOpen={false} toggleSidebar={toggleSidebar} />
     )
-    wrapper.find("#sidebar-toggle").simulate("click", {
-      stopPropagation: jest.fn(),
+    wrapper.find("button").simulate("click", {
+      stopPropagation: jest.fn()
     })
     expect(toggleSidebar).toHaveBeenCalled()
   })
diff --git a/browser/app/js/browser/__tests__/StorageInfo.test.js b/browser/app/js/browser/__tests__/StorageInfo.test.js
index efa457481..6cf1ccbf4 100644
--- a/browser/app/js/browser/__tests__/StorageInfo.test.js
+++ b/browser/app/js/browser/__tests__/StorageInfo.test.js
@@ -24,7 +24,7 @@ describe("StorageInfo", () => {
       <StorageInfo
         storageInfo={{ total: 100, free: 60 }}
         fetchStorageInfo={jest.fn()}
-      />,
+      />
     )
   })
 
@@ -34,7 +34,7 @@ describe("StorageInfo", () => {
       <StorageInfo
         storageInfo={{ total: 100, free: 60 }}
         fetchStorageInfo={fetchStorageInfo}
-      />,
+      />
     )
     expect(fetchStorageInfo).toHaveBeenCalled()
   })
diff --git a/browser/app/js/browser/__tests__/actions.test.js b/browser/app/js/browser/__tests__/actions.test.js
index 58ae908b9..20c49dec2 100644
--- a/browser/app/js/browser/__tests__/actions.test.js
+++ b/browser/app/js/browser/__tests__/actions.test.js
@@ -23,8 +23,8 @@ jest.mock("../../web", () => ({
     return Promise.resolve({
       storageInfo: {
         Total: 100,
-        Free: 60,
-      },
+        Free: 60
+      }
     })
   }),
   ServerInfo: jest.fn(() => {
@@ -33,9 +33,9 @@ jest.mock("../../web", () => ({
       MinioMemory: "test",
       MinioPlatform: "test",
       MinioRuntime: "test",
-      MinioGlobalInfo: "test",
+      MinioGlobalInfo: "test"
     })
-  }),
+  })
 }))
 
 const middlewares = [thunk]
@@ -49,9 +49,9 @@ describe("Common actions", () => {
         type: "common/SET_STORAGE_INFO",
         storageInfo: {
           total: 100,
-          free: 60,
-        },
-      },
+          free: 60
+        }
+      }
     ]
     return store.dispatch(actionsCommon.fetchStorageInfo()).then(() => {
       const actions = store.getActions()
@@ -69,9 +69,9 @@ describe("Common actions", () => {
           memory: "test",
           platform: "test",
           runtime: "test",
-          info: "test",
-        },
-      },
+          info: "test"
+        }
+      }
     ]
     return store.dispatch(actionsCommon.fetchServerInfo()).then(() => {
       const actions = store.getActions()
diff --git a/browser/app/js/browser/__tests__/reducer.test.js b/browser/app/js/browser/__tests__/reducer.test.js
index ee54b4039..8456f05c6 100644
--- a/browser/app/js/browser/__tests__/reducer.test.js
+++ b/browser/app/js/browser/__tests__/reducer.test.js
@@ -23,9 +23,9 @@ describe("common reducer", () => {
       sidebarOpen: false,
       storageInfo: {
         total: 0,
-        free: 0,
+        free: 0
       },
-      serverInfo: {},
+      serverInfo: {}
     })
   })
 
@@ -33,14 +33,14 @@ describe("common reducer", () => {
     expect(
       reducer(
         {
-          sidebarOpen: false,
+          sidebarOpen: false
         },
         {
-          type: actionsCommon.TOGGLE_SIDEBAR,
-        },
-      ),
+          type: actionsCommon.TOGGLE_SIDEBAR
+        }
+      )
     ).toEqual({
-      sidebarOpen: true,
+      sidebarOpen: true
     })
   })
 
@@ -48,14 +48,14 @@ describe("common reducer", () => {
     expect(
       reducer(
         {
-          sidebarOpen: true,
+          sidebarOpen: true
         },
         {
-          type: actionsCommon.CLOSE_SIDEBAR,
-        },
-      ),
+          type: actionsCommon.CLOSE_SIDEBAR
+        }
+      )
     ).toEqual({
-      sidebarOpen: false,
+      sidebarOpen: false
     })
   })
 
@@ -67,15 +67,15 @@ describe("common reducer", () => {
           type: actionsCommon.SET_STORAGE_INFO,
           storageInfo: {
             total: 100,
-            free: 40,
-          },
-        },
-      ),
+            free: 40
+          }
+        }
+      )
     ).toEqual({
       storageInfo: {
         total: 100,
-        free: 40,
-      },
+        free: 40
+      }
     })
   })
 
@@ -88,15 +88,15 @@ describe("common reducer", () => {
           memory: "test",
           platform: "test",
           runtime: "test",
-          info: "test",
-        },
-      }).serverInfo,
+          info: "test"
+        }
+      }).serverInfo
     ).toEqual({
       version: "test",
       memory: "test",
       platform: "test",
       runtime: "test",
-      info: "test",
+      info: "test"
     })
   })
 })
diff --git a/browser/app/js/browser/actions.js b/browser/app/js/browser/actions.js
index 36d000a09..f82d03b4f 100644
--- a/browser/app/js/browser/actions.js
+++ b/browser/app/js/browser/actions.js
@@ -22,11 +22,11 @@ export const SET_STORAGE_INFO = "common/SET_STORAGE_INFO"
 export const SET_SERVER_INFO = "common/SET_SERVER_INFO"
 
 export const toggleSidebar = () => ({
-  type: TOGGLE_SIDEBAR,
+  type: TOGGLE_SIDEBAR
 })
 
 export const closeSidebar = () => ({
-  type: CLOSE_SIDEBAR,
+  type: CLOSE_SIDEBAR
 })
 
 export const fetchStorageInfo = () => {
@@ -34,7 +34,7 @@ export const fetchStorageInfo = () => {
     return web.StorageInfo().then(res => {
       const storageInfo = {
         total: res.storageInfo.Total,
-        free: res.storageInfo.Free,
+        free: res.storageInfo.Free
       }
       dispatch(setStorageInfo(storageInfo))
     })
@@ -43,7 +43,7 @@ export const fetchStorageInfo = () => {
 
 export const setStorageInfo = storageInfo => ({
   type: SET_STORAGE_INFO,
-  storageInfo,
+  storageInfo
 })
 
 export const fetchServerInfo = () => {
@@ -54,7 +54,7 @@ export const fetchServerInfo = () => {
         memory: res.MinioMemory,
         platform: res.MinioPlatform,
         runtime: res.MinioRuntime,
-        info: res.MinioGlobalInfo,
+        info: res.MinioGlobalInfo
       }
       dispatch(setServerInfo(serverInfo))
     })
@@ -63,5 +63,5 @@ export const fetchServerInfo = () => {
 
 export const setServerInfo = serverInfo => ({
   type: SET_SERVER_INFO,
-  serverInfo,
+  serverInfo
 })
diff --git a/browser/app/js/browser/reducer.js b/browser/app/js/browser/reducer.js
index ffd40e068..1492c51e8 100644
--- a/browser/app/js/browser/reducer.js
+++ b/browser/app/js/browser/reducer.js
@@ -21,29 +21,29 @@ export default (
     sidebarOpen: false,
     storageInfo: {
       total: 0,
-      free: 0,
+      free: 0
     },
-    serverInfo: {},
+    serverInfo: {}
   },
-  action,
+  action
 ) => {
   switch (action.type) {
     case actionsCommon.TOGGLE_SIDEBAR:
       return Object.assign({}, state, {
-        sidebarOpen: !state.sidebarOpen,
+        sidebarOpen: !state.sidebarOpen
       })
     case actionsCommon.CLOSE_SIDEBAR:
       return Object.assign({}, state, {
-        sidebarOpen: false,
+        sidebarOpen: false
       })
     case actionsCommon.SET_STORAGE_INFO:
       return Object.assign({}, state, {
-        storageInfo: action.storageInfo,
+        storageInfo: action.storageInfo
       })
     case actionsCommon.SET_SERVER_INFO:
       return {
         ...state,
-        serverInfo: action.serverInfo,
+        serverInfo: action.serverInfo
       }
     default:
       return state
diff --git a/browser/app/js/buckets/Bucket.js b/browser/app/js/buckets/Bucket.js
index fb86301df..4ea6732bc 100644
--- a/browser/app/js/buckets/Bucket.js
+++ b/browser/app/js/buckets/Bucket.js
@@ -23,7 +23,7 @@ export const Bucket = ({ bucket, isActive, selectBucket }) => {
     <div
       className={classNames({
         buckets__item: true,
-        "buckets__item--active": isActive,
+        "buckets__item--active": isActive
       })}
       onClick={e => {
         e.preventDefault()
diff --git a/browser/app/js/buckets/BucketContainer.js b/browser/app/js/buckets/BucketContainer.js
index a54eec166..39d69ca25 100644
--- a/browser/app/js/buckets/BucketContainer.js
+++ b/browser/app/js/buckets/BucketContainer.js
@@ -22,13 +22,13 @@ import Bucket from "./Bucket"
 
 const mapStateToProps = (state, ownProps) => {
   return {
-    isActive: getCurrentBucket(state) === ownProps.bucket,
+    isActive: getCurrentBucket(state) === ownProps.bucket
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    selectBucket: bucket => dispatch(actionsBuckets.selectBucket(bucket)),
+    selectBucket: bucket => dispatch(actionsBuckets.selectBucket(bucket))
   }
 }
 
diff --git a/browser/app/js/buckets/BucketDropdown.js b/browser/app/js/buckets/BucketDropdown.js
index 8bc3ac5d3..300a5cdbe 100644
--- a/browser/app/js/buckets/BucketDropdown.js
+++ b/browser/app/js/buckets/BucketDropdown.js
@@ -26,18 +26,18 @@ export class BucketDropdown extends React.Component {
   constructor(props) {
     super(props)
     this.state = {
-      showBucketDropdown: false,
+      showBucketDropdown: false
     }
   }
 
   toggleDropdown() {
     if (this.state.showBucketDropdown) {
       this.setState({
-        showBucketDropdown: false,
+        showBucketDropdown: false
       })
     } else {
       this.setState({
-        showBucketDropdown: true,
+        showBucketDropdown: true
       })
     }
   }
@@ -83,7 +83,7 @@ export class BucketDropdown extends React.Component {
 const mapDispatchToProps = dispatch => {
   return {
     deleteBucket: bucket => dispatch(actionsBuckets.deleteBucket(bucket)),
-    showBucketPolicy: () => dispatch(actionsBuckets.showBucketPolicy()),
+    showBucketPolicy: () => dispatch(actionsBuckets.showBucketPolicy())
   }
 }
 
diff --git a/browser/app/js/buckets/BucketPolicyModal.js b/browser/app/js/buckets/BucketPolicyModal.js
index 6f5ad7dda..1c5eb1cc1 100644
--- a/browser/app/js/buckets/BucketPolicyModal.js
+++ b/browser/app/js/buckets/BucketPolicyModal.js
@@ -25,7 +25,7 @@ export const BucketPolicyModal = ({
   showBucketPolicy,
   currentBucket,
   hideBucketPolicy,
-  policies,
+  policies
 }) => {
   return (
     <Modal
@@ -53,13 +53,13 @@ const mapStateToProps = state => {
   return {
     currentBucket: state.buckets.currentBucket,
     showBucketPolicy: state.buckets.showBucketPolicy,
-    policies: state.buckets.policies,
+    policies: state.buckets.policies
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    hideBucketPolicy: () => dispatch(actionsBuckets.hideBucketPolicy()),
+    hideBucketPolicy: () => dispatch(actionsBuckets.hideBucketPolicy())
   }
 }
 
diff --git a/browser/app/js/buckets/BucketSearch.js b/browser/app/js/buckets/BucketSearch.js
index 6721f2525..bc9085235 100644
--- a/browser/app/js/buckets/BucketSearch.js
+++ b/browser/app/js/buckets/BucketSearch.js
@@ -37,7 +37,7 @@ const mapDispatchToProps = dispatch => {
   return {
     onChange: filter => {
       dispatch(actionsBuckets.setFilter(filter))
-    },
+    }
   }
 }
 
diff --git a/browser/app/js/buckets/MakeBucketModal.js b/browser/app/js/buckets/MakeBucketModal.js
index 2fee45c59..7892b2c7f 100644
--- a/browser/app/js/buckets/MakeBucketModal.js
+++ b/browser/app/js/buckets/MakeBucketModal.js
@@ -23,7 +23,7 @@ export class MakeBucketModal extends React.Component {
   constructor(props) {
     super(props)
     this.state = {
-      bucketName: "",
+      bucketName: ""
     }
   }
   onSubmit(e) {
@@ -37,7 +37,7 @@ export class MakeBucketModal extends React.Component {
   }
   hideModal() {
     this.setState({
-      bucketName: "",
+      bucketName: ""
     })
     this.props.hideMakeBucketModal()
   }
@@ -62,7 +62,7 @@ export class MakeBucketModal extends React.Component {
                 value={this.state.bucketName}
                 onChange={e =>
                   this.setState({
-                    bucketName: e.target.value,
+                    bucketName: e.target.value
                   })
                 }
                 autoFocus
@@ -78,14 +78,14 @@ export class MakeBucketModal extends React.Component {
 
 const mapStateToProps = state => {
   return {
-    showMakeBucketModal: state.buckets.showMakeBucketModal,
+    showMakeBucketModal: state.buckets.showMakeBucketModal
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
     makeBucket: bucket => dispatch(actionsBuckets.makeBucket(bucket)),
-    hideMakeBucketModal: () => dispatch(actionsBuckets.hideMakeBucketModal()),
+    hideMakeBucketModal: () => dispatch(actionsBuckets.hideMakeBucketModal())
   }
 }
 
diff --git a/browser/app/js/buckets/Policy.js b/browser/app/js/buckets/Policy.js
index c6b64f6c1..536ed1357 100644
--- a/browser/app/js/buckets/Policy.js
+++ b/browser/app/js/buckets/Policy.js
@@ -28,7 +28,7 @@ export class Policy extends React.Component {
       .SetBucketPolicy({
         bucketName: currentBucket,
         prefix: prefix,
-        policy: "none",
+        policy: "none"
       })
       .then(() => {
         fetchPolicies(currentBucket)
@@ -79,7 +79,7 @@ export class Policy extends React.Component {
 
 const mapStateToProps = state => {
   return {
-    currentBucket: state.buckets.currentBucket,
+    currentBucket: state.buckets.currentBucket
   }
 }
 
@@ -90,9 +90,9 @@ const mapDispatchToProps = dispatch => {
       dispatch(
         actionsAlert.set({
           type: type,
-          message: message,
-        }),
-      ),
+          message: message
+        })
+      )
   }
 }
 
diff --git a/browser/app/js/buckets/PolicyInput.js b/browser/app/js/buckets/PolicyInput.js
index 8839f9f26..ff91e08b3 100644
--- a/browser/app/js/buckets/PolicyInput.js
+++ b/browser/app/js/buckets/PolicyInput.js
@@ -42,7 +42,7 @@ export class PolicyInput extends React.Component {
 
     let policyAlreadyExists = this.props.policies.some(
       elem =>
-        this.prefix.value === elem.prefix && this.policy.value === elem.policy,
+        this.prefix.value === elem.prefix && this.policy.value === elem.policy
     )
     if (policyAlreadyExists) {
       showAlert("danger", "Policy for this prefix already exists.")
@@ -53,7 +53,7 @@ export class PolicyInput extends React.Component {
       .SetBucketPolicy({
         bucketName: currentBucket,
         prefix: this.prefix.value,
-        policy: this.policy.value,
+        policy: this.policy.value
       })
       .then(() => {
         fetchPolicies(currentBucket)
@@ -99,7 +99,7 @@ export class PolicyInput extends React.Component {
 const mapStateToProps = state => {
   return {
     currentBucket: state.buckets.currentBucket,
-    policies: state.buckets.policies,
+    policies: state.buckets.policies
   }
 }
 
@@ -111,9 +111,9 @@ const mapDispatchToProps = dispatch => {
       dispatch(
         actionsAlert.set({
           type: type,
-          message: message,
-        }),
-      ),
+          message: message
+        })
+      )
   }
 }
 
diff --git a/browser/app/js/buckets/__tests__/Bucket.test.js b/browser/app/js/buckets/__tests__/Bucket.test.js
index d139cc4eb..e4225e57f 100644
--- a/browser/app/js/buckets/__tests__/Bucket.test.js
+++ b/browser/app/js/buckets/__tests__/Bucket.test.js
@@ -26,16 +26,16 @@ describe("Bucket", () => {
   it("should call selectBucket when clicked", () => {
     const selectBucket = jest.fn()
     const wrapper = shallow(
-      <Bucket bucket={"test"} selectBucket={selectBucket} />,
+      <Bucket bucket={"test"} selectBucket={selectBucket} />
     )
-    wrapper.find("li").simulate("click", {
-      preventDefault: jest.fn(),
+    wrapper.find("div").simulate("click", {
+      preventDefault: jest.fn()
     })
     expect(selectBucket).toHaveBeenCalledWith("test")
   })
 
   it("should highlight the selected bucket", () => {
     const wrapper = shallow(<Bucket bucket={"test"} isActive={true} />)
-    expect(wrapper.find("li").hasClass("active")).toBeTruthy()
+    expect(wrapper.find("div").hasClass("buckets__item--active")).toBeTruthy()
   })
 })
diff --git a/browser/app/js/buckets/__tests__/BucketContainer.test.js b/browser/app/js/buckets/__tests__/BucketContainer.test.js
index 069d8c815..48331aded 100644
--- a/browser/app/js/buckets/__tests__/BucketContainer.test.js
+++ b/browser/app/js/buckets/__tests__/BucketContainer.test.js
@@ -26,8 +26,8 @@ describe("BucketContainer", () => {
   beforeEach(() => {
     store = mockStore({
       buckets: {
-        currentBucket: "Test",
-      },
+        currentBucket: "Test"
+      }
     })
     store.dispatch = jest.fn()
   })
@@ -41,8 +41,8 @@ describe("BucketContainer", () => {
     expect(wrapper.props()).toEqual(
       expect.objectContaining({
         isActive: expect.any(Boolean),
-        selectBucket: expect.any(Function),
-      }),
+        selectBucket: expect.any(Function)
+      })
     )
   })
 
diff --git a/browser/app/js/buckets/__tests__/BucketDropdown.test.js b/browser/app/js/buckets/__tests__/BucketDropdown.test.js
index 137181007..048240a2c 100644
--- a/browser/app/js/buckets/__tests__/BucketDropdown.test.js
+++ b/browser/app/js/buckets/__tests__/BucketDropdown.test.js
@@ -35,13 +35,13 @@ describe("BucketDropdown", () => {
   it("should call showBucketPolicy when Edit Policy link is clicked", () => {
     const showBucketPolicy = jest.fn()
     const wrapper = shallow(
-      <BucketDropdown showBucketPolicy={showBucketPolicy} />,
+      <BucketDropdown showBucketPolicy={showBucketPolicy} />
     )
     wrapper
-      .find("li a")
+      .find("MenuItem")
       .at(0)
       .simulate("click", {
-        stopPropagation: jest.fn(),
+        stopPropagation: jest.fn()
       })
     expect(showBucketPolicy).toHaveBeenCalled()
   })
@@ -49,13 +49,13 @@ describe("BucketDropdown", () => {
   it("should call deleteBucket when Delete link is clicked", () => {
     const deleteBucket = jest.fn()
     const wrapper = shallow(
-      <BucketDropdown bucket={"test"} deleteBucket={deleteBucket} />,
+      <BucketDropdown bucket={"test"} deleteBucket={deleteBucket} />
     )
     wrapper
-      .find("li a")
+      .find("MenuItem")
       .at(1)
       .simulate("click", {
-        stopPropagation: jest.fn(),
+        stopPropagation: jest.fn()
       })
     expect(deleteBucket).toHaveBeenCalledWith("test")
   })
diff --git a/browser/app/js/buckets/__tests__/BucketList.test.js b/browser/app/js/buckets/__tests__/BucketList.test.js
index 3be8ca26d..746ee076a 100644
--- a/browser/app/js/buckets/__tests__/BucketList.test.js
+++ b/browser/app/js/buckets/__tests__/BucketList.test.js
@@ -23,19 +23,19 @@ jest.mock("../../web", () => ({
   LoggedIn: jest
     .fn(() => false)
     .mockReturnValueOnce(true)
-    .mockReturnValueOnce(true),
+    .mockReturnValueOnce(true)
 }))
 
 describe("BucketList", () => {
   it("should render without crashing", () => {
     const fetchBuckets = jest.fn()
-    shallow(<BucketList visibleBuckets={[]} fetchBuckets={fetchBuckets} />)
+    shallow(<BucketList filteredBuckets={[]} fetchBuckets={fetchBuckets} />)
   })
 
   it("should call fetchBuckets before component is mounted", () => {
     const fetchBuckets = jest.fn()
     const wrapper = shallow(
-      <BucketList visibleBuckets={[]} fetchBuckets={fetchBuckets} />,
+      <BucketList filteredBuckets={[]} fetchBuckets={fetchBuckets} />
     )
     expect(fetchBuckets).toHaveBeenCalled()
   })
@@ -46,10 +46,10 @@ describe("BucketList", () => {
     history.push("/bk1/pre1")
     const wrapper = shallow(
       <BucketList
-        visibleBuckets={[]}
+        filteredBuckets={[]}
         setBucketList={setBucketList}
         selectBucket={selectBucket}
-      />,
+      />
     )
     expect(setBucketList).toHaveBeenCalledWith(["bk1"])
     expect(selectBucket).toHaveBeenCalledWith("bk1", "pre1")
diff --git a/browser/app/js/buckets/__tests__/BucketPolicyModal.test.js b/browser/app/js/buckets/__tests__/BucketPolicyModal.test.js
index e65ae6543..f9b87e262 100644
--- a/browser/app/js/buckets/__tests__/BucketPolicyModal.test.js
+++ b/browser/app/js/buckets/__tests__/BucketPolicyModal.test.js
@@ -27,15 +27,15 @@ describe("BucketPolicyModal", () => {
   it("should call hideBucketPolicy when close button is clicked", () => {
     const hideBucketPolicy = jest.fn()
     const wrapper = shallow(
-      <BucketPolicyModal hideBucketPolicy={hideBucketPolicy} policies={[]} />,
+      <BucketPolicyModal hideBucketPolicy={hideBucketPolicy} policies={[]} />
     )
-    wrapper.find("button").simulate("click")
+    wrapper.find("i.close").simulate("click")
     expect(hideBucketPolicy).toHaveBeenCalled()
   })
 
   it("should include the PolicyInput and Policy components when there are any policies", () => {
     const wrapper = shallow(
-      <BucketPolicyModal policies={[{ prefix: "test", policy: READ_ONLY }]} />,
+      <BucketPolicyModal policies={[{ prefix: "test", policy: READ_ONLY }]} />
     )
     expect(wrapper.find("Connect(PolicyInput)").length).toBe(1)
     expect(wrapper.find("Connect(Policy)").length).toBe(1)
diff --git a/browser/app/js/buckets/__tests__/BucketSearch.test.js b/browser/app/js/buckets/__tests__/BucketSearch.test.js
index 0c4b94c26..98b96e32d 100644
--- a/browser/app/js/buckets/__tests__/BucketSearch.test.js
+++ b/browser/app/js/buckets/__tests__/BucketSearch.test.js
@@ -28,8 +28,8 @@ describe("BucketSearch", () => {
     const wrapper = shallow(<BucketSearch onChange={onChange} />)
     wrapper.find("input").simulate("change", {
       target: {
-        value: "test",
-      },
+        value: "test"
+      }
     })
     expect(onChange).toHaveBeenCalledWith("test")
   })
diff --git a/browser/app/js/buckets/__tests__/MakeBucketModal.test.js b/browser/app/js/buckets/__tests__/MakeBucketModal.test.js
index 2a64ac70d..efd4e4d02 100644
--- a/browser/app/js/buckets/__tests__/MakeBucketModal.test.js
+++ b/browser/app/js/buckets/__tests__/MakeBucketModal.test.js
@@ -26,24 +26,24 @@ describe("MakeBucketModal", () => {
   it("should call hideMakeBucketModal when close button is clicked", () => {
     const hideMakeBucketModal = jest.fn()
     const wrapper = shallow(
-      <MakeBucketModal hideMakeBucketModal={hideMakeBucketModal} />,
+      <MakeBucketModal hideMakeBucketModal={hideMakeBucketModal} />
     )
-    wrapper.find("button").simulate("click")
+    wrapper.find("i.close").simulate("click")
     expect(hideMakeBucketModal).toHaveBeenCalled()
   })
 
   it("bucketName should be cleared before hiding the modal", () => {
     const hideMakeBucketModal = jest.fn()
     const wrapper = shallow(
-      <MakeBucketModal hideMakeBucketModal={hideMakeBucketModal} />,
+      <MakeBucketModal hideMakeBucketModal={hideMakeBucketModal} />
     )
     wrapper.find("input").simulate("change", {
       target: {
-        value: "test",
-      },
+        value: "test"
+      }
     })
     expect(wrapper.state("bucketName")).toBe("test")
-    wrapper.find("button").simulate("click")
+    wrapper.find("i.close").simulate("click")
     expect(wrapper.state("bucketName")).toBe("")
   })
 
@@ -54,15 +54,15 @@ describe("MakeBucketModal", () => {
       <MakeBucketModal
         makeBucket={makeBucket}
         hideMakeBucketModal={hideMakeBucketModal}
-      />,
+      />
     )
     wrapper.find("input").simulate("change", {
       target: {
-        value: "test",
-      },
+        value: "test"
+      }
     })
     wrapper.find("form").simulate("submit", {
-      preventDefault: jest.fn(),
+      preventDefault: jest.fn()
     })
     expect(makeBucket).toHaveBeenCalledWith("test")
   })
@@ -74,15 +74,15 @@ describe("MakeBucketModal", () => {
       <MakeBucketModal
         makeBucket={makeBucket}
         hideMakeBucketModal={hideMakeBucketModal}
-      />,
+      />
     )
     wrapper.find("input").simulate("change", {
       target: {
-        value: "test",
-      },
+        value: "test"
+      }
     })
     wrapper.find("form").simulate("submit", {
-      preventDefault: jest.fn(),
+      preventDefault: jest.fn()
     })
     expect(hideMakeBucketModal).toHaveBeenCalled()
     expect(wrapper.state("bucketName")).toBe("")
diff --git a/browser/app/js/buckets/__tests__/Policy.test.js b/browser/app/js/buckets/__tests__/Policy.test.js
index 1b81373fd..871a32b3f 100644
--- a/browser/app/js/buckets/__tests__/Policy.test.js
+++ b/browser/app/js/buckets/__tests__/Policy.test.js
@@ -23,13 +23,13 @@ import web from "../../web"
 jest.mock("../../web", () => ({
   SetBucketPolicy: jest.fn(() => {
     return Promise.resolve()
-  }),
+  })
 }))
 
 describe("Policy", () => {
   it("should render without crashing", () => {
     shallow(
-      <Policy currentBucket={"bucket"} prefix={"foo"} policy={READ_ONLY} />,
+      <Policy currentBucket={"bucket"} prefix={"foo"} policy={READ_ONLY} />
     )
   })
 
@@ -41,16 +41,16 @@ describe("Policy", () => {
         prefix={"foo"}
         policy={READ_ONLY}
         fetchPolicies={fetchPolicies}
-      />,
+      />
     )
     wrapper.find("button").simulate("click", {
-      preventDefault: jest.fn(),
+      preventDefault: jest.fn()
     })
 
     expect(web.SetBucketPolicy).toHaveBeenCalledWith({
       bucketName: "bucket",
       prefix: "foo",
-      policy: "none",
+      policy: "none"
     })
 
     setImmediate(() => {
@@ -60,13 +60,13 @@ describe("Policy", () => {
 
   it("should change the empty string to '*' while displaying prefixes", () => {
     const wrapper = shallow(
-      <Policy currentBucket={"bucket"} prefix={""} policy={READ_ONLY} />,
+      <Policy currentBucket={"bucket"} prefix={""} policy={READ_ONLY} />
     )
     expect(
       wrapper
-        .find(".pmbl-item")
+        .find("input")
         .at(0)
-        .text(),
+        .prop("value")
     ).toEqual("*")
   })
 })
diff --git a/browser/app/js/buckets/__tests__/PolicyInput.test.js b/browser/app/js/buckets/__tests__/PolicyInput.test.js
index 929aad66b..7b46eecd1 100644
--- a/browser/app/js/buckets/__tests__/PolicyInput.test.js
+++ b/browser/app/js/buckets/__tests__/PolicyInput.test.js
@@ -23,21 +23,21 @@ import web from "../../web"
 jest.mock("../../web", () => ({
   SetBucketPolicy: jest.fn(() => {
     return Promise.resolve()
-  }),
+  })
 }))
 
 describe("PolicyInput", () => {
   it("should render without crashing", () => {
     const fetchPolicies = jest.fn()
     shallow(
-      <PolicyInput currentBucket={"bucket"} fetchPolicies={fetchPolicies} />,
+      <PolicyInput currentBucket={"bucket"} fetchPolicies={fetchPolicies} />
     )
   })
 
   it("should call fetchPolicies after the component has mounted", () => {
     const fetchPolicies = jest.fn()
     const wrapper = shallow(
-      <PolicyInput currentBucket={"bucket"} fetchPolicies={fetchPolicies} />,
+      <PolicyInput currentBucket={"bucket"} fetchPolicies={fetchPolicies} />
     )
     setImmediate(() => {
       expect(fetchPolicies).toHaveBeenCalled()
@@ -51,22 +51,22 @@ describe("PolicyInput", () => {
         currentBucket={"bucket"}
         policies={[]}
         fetchPolicies={fetchPolicies}
-      />,
+      />
     )
     wrapper.instance().prefix = {
-      value: "baz",
+      value: "baz"
     }
     wrapper.instance().policy = {
-      value: READ_ONLY,
+      value: READ_ONLY
     }
     wrapper.find("button").simulate("click", {
-      preventDefault: jest.fn(),
+      preventDefault: jest.fn()
     })
 
     expect(web.SetBucketPolicy).toHaveBeenCalledWith({
       bucketName: "bucket",
       prefix: "baz",
-      policy: READ_ONLY,
+      policy: READ_ONLY
     })
 
     setImmediate(() => {
@@ -81,21 +81,21 @@ describe("PolicyInput", () => {
         currentBucket={"bucket"}
         policies={[]}
         fetchPolicies={fetchPolicies}
-      />,
+      />
     )
     wrapper.instance().prefix = {
-      value: "*",
+      value: "*"
     }
     wrapper.instance().policy = {
-      value: READ_ONLY,
+      value: READ_ONLY
     }
 
     wrapper.find("button").simulate("click", {
-      preventDefault: jest.fn(),
+      preventDefault: jest.fn()
     })
 
     expect(wrapper.instance().prefix).toEqual({
-      value: "",
+      value: ""
     })
   })
 })
diff --git a/browser/app/js/buckets/__tests__/actions.test.js b/browser/app/js/buckets/__tests__/actions.test.js
index a71e5071e..38cd989c1 100644
--- a/browser/app/js/buckets/__tests__/actions.test.js
+++ b/browser/app/js/buckets/__tests__/actions.test.js
@@ -24,12 +24,12 @@ jest.mock("../../web", () => ({
     return Promise.resolve({
       buckets: [
         {
-          name: "test1",
+          name: "test1"
         },
         {
-          name: "test2",
-        },
-      ],
+          name: "test2"
+        }
+      ]
     })
   }),
   MakeBucket: jest.fn(() => {
@@ -37,11 +37,11 @@ jest.mock("../../web", () => ({
   }),
   DeleteBucket: jest.fn(() => {
     return Promise.resolve()
-  }),
+  })
 }))
 
 jest.mock("../../objects/actions", () => ({
-  selectPrefix: () => dispatch => {},
+  selectPrefix: () => dispatch => {}
 }))
 
 const middlewares = [thunk]
@@ -53,12 +53,12 @@ describe("Buckets actions", () => {
     const expectedActions = [
       {
         type: "buckets/SET_LIST",
-        buckets: ["test1", "test2"],
+        buckets: ["test1", "test2"]
       },
       {
         type: "buckets/SET_CURRENT_BUCKET",
-        bucket: "test1",
-      },
+        bucket: "test1"
+      }
     ]
     return store.dispatch(actionsBuckets.fetchBuckets()).then(() => {
       const actions = store.getActions()
@@ -72,12 +72,12 @@ describe("Buckets actions", () => {
     const expectedActions = [
       {
         type: "buckets/SET_LIST",
-        buckets: ["test1", "test2"],
+        buckets: ["test1", "test2"]
       },
       {
         type: "buckets/SET_CURRENT_BUCKET",
-        bucket: "test2",
-      },
+        bucket: "test2"
+      }
     ]
     window.location
     return store.dispatch(actionsBuckets.fetchBuckets()).then(() => {
@@ -92,12 +92,12 @@ describe("Buckets actions", () => {
     const expectedActions = [
       {
         type: "buckets/SET_LIST",
-        buckets: ["test1", "test2"],
+        buckets: ["test1", "test2"]
       },
       {
         type: "buckets/SET_CURRENT_BUCKET",
-        bucket: "test1",
-      },
+        bucket: "test1"
+      }
     ]
     window.location
     return store.dispatch(actionsBuckets.fetchBuckets()).then(() => {
@@ -111,8 +111,8 @@ describe("Buckets actions", () => {
     const expectedActions = [
       {
         type: "buckets/SET_CURRENT_BUCKET",
-        bucket: "test1",
-      },
+        bucket: "test1"
+      }
     ]
     store.dispatch(actionsBuckets.selectBucket("test1"))
     const actions = store.getActions()
@@ -124,8 +124,8 @@ describe("Buckets actions", () => {
     const expectedActions = [
       {
         type: "buckets/SHOW_MAKE_BUCKET_MODAL",
-        show: true,
-      },
+        show: true
+      }
     ]
     store.dispatch(actionsBuckets.showMakeBucketModal())
     const actions = store.getActions()
@@ -137,8 +137,8 @@ describe("Buckets actions", () => {
     const expectedActions = [
       {
         type: "buckets/SHOW_MAKE_BUCKET_MODAL",
-        show: false,
-      },
+        show: false
+      }
     ]
     store.dispatch(actionsBuckets.hideMakeBucketModal())
     const actions = store.getActions()
@@ -150,8 +150,8 @@ describe("Buckets actions", () => {
     const expectedActions = [
       {
         type: "buckets/SHOW_BUCKET_POLICY",
-        show: true,
-      },
+        show: true
+      }
     ]
     store.dispatch(actionsBuckets.showBucketPolicy())
     const actions = store.getActions()
@@ -163,8 +163,8 @@ describe("Buckets actions", () => {
     const expectedActions = [
       {
         type: "buckets/SHOW_BUCKET_POLICY",
-        show: false,
-      },
+        show: false
+      }
     ]
     store.dispatch(actionsBuckets.hideBucketPolicy())
     const actions = store.getActions()
@@ -176,8 +176,8 @@ describe("Buckets actions", () => {
     const expectedActions = [
       {
         type: "buckets/SET_POLICIES",
-        policies: ["test1", "test2"],
-      },
+        policies: ["test1", "test2"]
+      }
     ]
     store.dispatch(actionsBuckets.setPolicies(["test1", "test2"]))
     const actions = store.getActions()
@@ -189,8 +189,8 @@ describe("Buckets actions", () => {
     const expectedActions = [
       {
         type: "buckets/ADD",
-        bucket: "test",
-      },
+        bucket: "test"
+      }
     ]
     store.dispatch(actionsBuckets.addBucket("test"))
     const actions = store.getActions()
@@ -202,8 +202,8 @@ describe("Buckets actions", () => {
     const expectedActions = [
       {
         type: "buckets/REMOVE",
-        bucket: "test",
-      },
+        bucket: "test"
+      }
     ]
     store.dispatch(actionsBuckets.removeBucket("test"))
     const actions = store.getActions()
@@ -215,12 +215,12 @@ describe("Buckets actions", () => {
     const expectedActions = [
       {
         type: "buckets/ADD",
-        bucket: "test1",
+        bucket: "test1"
       },
       {
         type: "buckets/SET_CURRENT_BUCKET",
-        bucket: "test1",
-      },
+        bucket: "test1"
+      }
     ]
     return store.dispatch(actionsBuckets.makeBucket("test1")).then(() => {
       const actions = store.getActions()
@@ -239,26 +239,26 @@ describe("Buckets actions", () => {
           alert: {
             id: 0,
             message: "Bucket 'test3' has been deleted.",
-            type: "info",
-          },
+            type: "info"
+          }
         },
         {
           type: "buckets/REMOVE",
-          bucket: "test3",
+          bucket: "test3"
         },
         {
           type: "buckets/SET_LIST",
-          buckets: ["test1", "test2"],
+          buckets: ["test1", "test2"]
         },
         {
           type: "buckets/SET_CURRENT_BUCKET",
-          bucket: "test1",
-        },
+          bucket: "test1"
+        }
       ]
       return store.dispatch(actionsBuckets.deleteBucket("test3")).then(() => {
         const actions = store.getActions()
         expect(actions).toEqual(expectedActions)
       })
-    },
+    }
   )
 })
diff --git a/browser/app/js/buckets/__tests__/reducer.test.js b/browser/app/js/buckets/__tests__/reducer.test.js
index db3e966a3..153632a54 100644
--- a/browser/app/js/buckets/__tests__/reducer.test.js
+++ b/browser/app/js/buckets/__tests__/reducer.test.js
@@ -26,14 +26,14 @@ describe("buckets reducer", () => {
       filter: "",
       currentBucket: "",
       showBucketPolicy: false,
-      showMakeBucketModal: false,
+      showMakeBucketModal: false
     })
   })
 
   it("should handle SET_LIST", () => {
     const newState = reducer(undefined, {
       type: actions.SET_LIST,
-      buckets: ["bk1", "bk2"],
+      buckets: ["bk1", "bk2"]
     })
     expect(newState.list).toEqual(["bk1", "bk2"])
   })
@@ -41,12 +41,12 @@ describe("buckets reducer", () => {
   it("should handle ADD", () => {
     const newState = reducer(
       {
-        list: ["test1", "test2"],
+        list: ["test1", "test2"]
       },
       {
         type: actions.ADD,
-        bucket: "test3",
-      },
+        bucket: "test3"
+      }
     )
     expect(newState.list).toEqual(["test3", "test1", "test2"])
   })
@@ -54,12 +54,12 @@ describe("buckets reducer", () => {
   it("should handle REMOVE", () => {
     const newState = reducer(
       {
-        list: ["test1", "test2"],
+        list: ["test1", "test2"]
       },
       {
         type: actions.REMOVE,
-        bucket: "test2",
-      },
+        bucket: "test2"
+      }
     )
     expect(newState.list).toEqual(["test1"])
   })
@@ -67,7 +67,7 @@ describe("buckets reducer", () => {
   it("should handle SET_FILTER", () => {
     const newState = reducer(undefined, {
       type: actions.SET_FILTER,
-      filter: "test",
+      filter: "test"
     })
     expect(newState.filter).toEqual("test")
   })
@@ -75,7 +75,7 @@ describe("buckets reducer", () => {
   it("should handle SET_CURRENT_BUCKET", () => {
     const newState = reducer(undefined, {
       type: actions.SET_CURRENT_BUCKET,
-      bucket: "test",
+      bucket: "test"
     })
     expect(newState.currentBucket).toEqual("test")
   })
@@ -83,7 +83,7 @@ describe("buckets reducer", () => {
   it("should handle SET_POLICIES", () => {
     const newState = reducer(undefined, {
       type: actions.SET_POLICIES,
-      policies: ["test1", "test2"],
+      policies: ["test1", "test2"]
     })
     expect(newState.policies).toEqual(["test1", "test2"])
   })
@@ -91,7 +91,7 @@ describe("buckets reducer", () => {
   it("should handle SHOW_BUCKET_POLICY", () => {
     const newState = reducer(undefined, {
       type: actions.SHOW_BUCKET_POLICY,
-      show: true,
+      show: true
     })
     expect(newState.showBucketPolicy).toBeTruthy()
   })
@@ -99,7 +99,7 @@ describe("buckets reducer", () => {
   it("should handle SHOW_MAKE_BUCKET_MODAL", () => {
     const newState = reducer(undefined, {
       type: actions.SHOW_MAKE_BUCKET_MODAL,
-      show: true,
+      show: true
     })
     expect(newState.showMakeBucketModal).toBeTruthy()
   })
diff --git a/browser/app/js/buckets/actions.js b/browser/app/js/buckets/actions.js
index ddbf7095e..fdfe3344b 100644
--- a/browser/app/js/buckets/actions.js
+++ b/browser/app/js/buckets/actions.js
@@ -52,14 +52,14 @@ export const fetchBuckets = () => {
 export const setList = buckets => {
   return {
     type: SET_LIST,
-    buckets,
+    buckets
   }
 }
 
 export const setFilter = filter => {
   return {
     type: SET_FILTER,
-    filter,
+    filter
   }
 }
 
@@ -73,7 +73,7 @@ export const selectBucket = (bucket, prefix) => {
 export const setCurrentBucket = bucket => {
   return {
     type: SET_CURRENT_BUCKET,
-    bucket,
+    bucket
   }
 }
 
@@ -81,7 +81,7 @@ export const makeBucket = bucket => {
   return function(dispatch) {
     return web
       .MakeBucket({
-        bucketName: bucket,
+        bucketName: bucket
       })
       .then(() => {
         dispatch(addBucket(bucket))
@@ -91,9 +91,9 @@ export const makeBucket = bucket => {
         dispatch(
           alertActions.set({
             type: "danger",
-            message: err.message,
-          }),
-        ),
+            message: err.message
+          })
+        )
       )
   }
 }
@@ -102,14 +102,14 @@ export const deleteBucket = bucket => {
   return function(dispatch) {
     return web
       .DeleteBucket({
-        bucketName: bucket,
+        bucketName: bucket
       })
       .then(() => {
         dispatch(
           alertActions.set({
             type: "info",
-            message: "Bucket '" + bucket + "' has been deleted.",
-          }),
+            message: "Bucket '" + bucket + "' has been deleted."
+          })
         )
         dispatch(removeBucket(bucket))
         dispatch(fetchBuckets())
@@ -118,8 +118,8 @@ export const deleteBucket = bucket => {
         dispatch(
           alertActions.set({
             type: "danger",
-            message: err.message,
-          }),
+            message: err.message
+          })
         )
       })
   }
@@ -127,29 +127,29 @@ export const deleteBucket = bucket => {
 
 export const addBucket = bucket => ({
   type: ADD,
-  bucket,
+  bucket
 })
 
 export const removeBucket = bucket => ({
   type: REMOVE,
-  bucket,
+  bucket
 })
 
 export const showMakeBucketModal = () => ({
   type: SHOW_MAKE_BUCKET_MODAL,
-  show: true,
+  show: true
 })
 
 export const hideMakeBucketModal = () => ({
   type: SHOW_MAKE_BUCKET_MODAL,
-  show: false,
+  show: false
 })
 
 export const fetchPolicies = bucket => {
   return function(dispatch) {
     return web
       .ListAllBucketPolicies({
-        bucketName: bucket,
+        bucketName: bucket
       })
       .then(res => {
         let policies = res.policies
@@ -160,8 +160,8 @@ export const fetchPolicies = bucket => {
         dispatch(
           alertActions.set({
             type: "danger",
-            message: err.message,
-          }),
+            message: err.message
+          })
         )
       })
   }
@@ -169,15 +169,15 @@ export const fetchPolicies = bucket => {
 
 export const setPolicies = policies => ({
   type: SET_POLICIES,
-  policies,
+  policies
 })
 
 export const showBucketPolicy = () => ({
   type: SHOW_BUCKET_POLICY,
-  show: true,
+  show: true
 })
 
 export const hideBucketPolicy = () => ({
   type: SHOW_BUCKET_POLICY,
-  show: false,
+  show: false
 })
diff --git a/browser/app/js/buckets/reducer.js b/browser/app/js/buckets/reducer.js
index aa3552880..4c1bdfd14 100644
--- a/browser/app/js/buckets/reducer.js
+++ b/browser/app/js/buckets/reducer.js
@@ -31,50 +31,50 @@ export default (
     currentBucket: "",
     showMakeBucketModal: false,
     policies: [],
-    showBucketPolicy: false,
+    showBucketPolicy: false
   },
-  action,
+  action
 ) => {
   switch (action.type) {
     case actionsBuckets.SET_LIST:
       return {
         ...state,
-        list: action.buckets,
+        list: action.buckets
       }
     case actionsBuckets.ADD:
       return {
         ...state,
-        list: [action.bucket, ...state.list],
+        list: [action.bucket, ...state.list]
       }
     case actionsBuckets.REMOVE:
       return {
         ...state,
-        list: removeBucket(state.list, action),
+        list: removeBucket(state.list, action)
       }
     case actionsBuckets.SET_FILTER:
       return {
         ...state,
-        filter: action.filter,
+        filter: action.filter
       }
     case actionsBuckets.SET_CURRENT_BUCKET:
       return {
         ...state,
-        currentBucket: action.bucket,
+        currentBucket: action.bucket
       }
     case actionsBuckets.SHOW_MAKE_BUCKET_MODAL:
       return {
         ...state,
-        showMakeBucketModal: action.show,
+        showMakeBucketModal: action.show
       }
     case actionsBuckets.SET_POLICIES:
       return {
         ...state,
-        policies: action.policies,
+        policies: action.policies
       }
     case actionsBuckets.SHOW_BUCKET_POLICY:
       return {
         ...state,
-        showBucketPolicy: action.show,
+        showBucketPolicy: action.show
       }
     default:
       return state
diff --git a/browser/app/js/buckets/selectors.js b/browser/app/js/buckets/selectors.js
index c16e89e86..e0ddf2f44 100644
--- a/browser/app/js/buckets/selectors.js
+++ b/browser/app/js/buckets/selectors.js
@@ -22,7 +22,7 @@ const bucketsFilterSelector = state => state.buckets.filter
 export const getFilteredBuckets = createSelector(
   bucketsSelector,
   bucketsFilterSelector,
-  (buckets, filter) => buckets.filter(bucket => bucket.indexOf(filter) > -1),
+  (buckets, filter) => buckets.filter(bucket => bucket.indexOf(filter) > -1)
 )
 
 export const getCurrentBucket = state => state.buckets.currentBucket
diff --git a/browser/app/js/components/BrowserUpdate.js b/browser/app/js/components/BrowserUpdate.js
index a7d5e2273..5893b5fd2 100644
--- a/browser/app/js/components/BrowserUpdate.js
+++ b/browser/app/js/components/BrowserUpdate.js
@@ -45,6 +45,6 @@ let BrowserUpdate = ({ latestUiVersion }) => {
 
 export default connect(state => {
   return {
-    latestUiVersion: state.latestUiVersion,
+    latestUiVersion: state.latestUiVersion
   }
 })(BrowserUpdate)
diff --git a/browser/app/js/history.js b/browser/app/js/history.js
index deb8c1711..a88e3740c 100644
--- a/browser/app/js/history.js
+++ b/browser/app/js/history.js
@@ -18,7 +18,7 @@ import createHistory from "history/createBrowserHistory"
 import { minioBrowserPrefix } from "./constants"
 
 const history = createHistory({
-  basename: minioBrowserPrefix,
+  basename: minioBrowserPrefix
 })
 
 export default history
diff --git a/browser/app/js/jest/setup.js b/browser/app/js/jest/setup.js
index 95dce8bdb..886cd840e 100644
--- a/browser/app/js/jest/setup.js
+++ b/browser/app/js/jest/setup.js
@@ -19,5 +19,5 @@ import { configure } from "enzyme"
 import Adapter from "enzyme-adapter-react-16"
 
 configure({
-  adapter: new Adapter(),
+  adapter: new Adapter()
 })
diff --git a/browser/app/js/jsonrpc.js b/browser/app/js/jsonrpc.js
index fca6e3c09..c26fcf133 100644
--- a/browser/app/js/jsonrpc.js
+++ b/browser/app/js/jsonrpc.js
@@ -63,7 +63,7 @@ export default class JSONrpc {
       id: options.id,
       jsonrpc: this.version,
       params: options.params ? options.params : {},
-      method: this.namespace ? this.namespace + "." + method : method,
+      method: this.namespace ? this.namespace + "." + method : method
     }
     let requestParams = {
       host: this.host,
@@ -76,8 +76,8 @@ export default class JSONrpc {
         "x-amz-date":
           Moment()
             .utc()
-            .format("YYYYMMDDTHHmmss") + "Z",
-      },
+            .format("YYYYMMDDTHHmmss") + "Z"
+      }
     }
 
     if (token) {
diff --git a/browser/app/js/mime.js b/browser/app/js/mime.js
index 41c68745e..801a61bc8 100644
--- a/browser/app/js/mime.js
+++ b/browser/app/js/mime.js
@@ -59,7 +59,7 @@ const isCode = (name, contentType) => {
     "scm",
     "lisp",
     "asp",
-    "aspx",
+    "aspx"
   ]
   const ext = name.split(".").reverse()[0]
   for (var i in codeExt) {
@@ -121,7 +121,7 @@ export const getDataType = (name, contentType) => {
     ["zip", isZip],
     ["excel", isExcel],
     ["doc", isDoc],
-    ["presentation", isPresentation],
+    ["presentation", isPresentation]
   ]
   for (var i in check) {
     if (check[i][1](name, contentType)) return check[i][0]
diff --git a/browser/app/js/objects/DeleteObjectConfirmModal.js b/browser/app/js/objects/DeleteObjectConfirmModal.js
index 1990557c4..1bfde0252 100644
--- a/browser/app/js/objects/DeleteObjectConfirmModal.js
+++ b/browser/app/js/objects/DeleteObjectConfirmModal.js
@@ -19,7 +19,7 @@ import ConfirmModal from "../browser/ConfirmModal"
 
 export const DeleteObjectConfirmModal = ({
   deleteObject,
-  hideDeleteConfirmModal,
+  hideDeleteConfirmModal
 }) => (
   <ConfirmModal
     show={true}
diff --git a/browser/app/js/objects/ObjectContainer.js b/browser/app/js/objects/ObjectContainer.js
index eb44496c4..3024ad2bb 100644
--- a/browser/app/js/objects/ObjectContainer.js
+++ b/browser/app/js/objects/ObjectContainer.js
@@ -27,14 +27,14 @@ export const ObjectContainer = ({ object, downloadObject }) => {
     name: object.name,
     contentType: object.contentType,
     size: humanize.filesize(object.size),
-    lastModified: Moment(object.lastModified).format("lll"),
+    lastModified: Moment(object.lastModified).format("lll")
   }
   return <ObjectItem {...props} onClick={() => downloadObject(object.name)} />
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    downloadObject: object => dispatch(actionsObjects.downloadObject(object)),
+    downloadObject: object => dispatch(actionsObjects.downloadObject(object))
   }
 }
 
diff --git a/browser/app/js/objects/ObjectItem.js b/browser/app/js/objects/ObjectItem.js
index b52d0bb9d..5554165e5 100644
--- a/browser/app/js/objects/ObjectItem.js
+++ b/browser/app/js/objects/ObjectItem.js
@@ -29,13 +29,13 @@ export const ObjectItem = ({
   checked,
   checkObject,
   uncheckObject,
-  onClick,
+  onClick
 }) => {
   return (
     <div
       className={classNames({
         objects__row: true,
-        "objects__row--directory": getDataType(name, contentType) == "folder",
+        "objects__row--directory": getDataType(name, contentType) == "folder"
       })}
     >
       <div
@@ -75,14 +75,14 @@ export const ObjectItem = ({
 
 const mapStateToProps = (state, ownProps) => {
   return {
-    checked: getCheckedList(state).indexOf(ownProps.name) >= 0,
+    checked: getCheckedList(state).indexOf(ownProps.name) >= 0
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
     checkObject: name => dispatch(actions.checkObject(name)),
-    uncheckObject: name => dispatch(actions.uncheckObject(name)),
+    uncheckObject: name => dispatch(actions.uncheckObject(name))
   }
 }
 
diff --git a/browser/app/js/objects/ObjectsHeader.js b/browser/app/js/objects/ObjectsHeader.js
index 8641112da..c41c660cb 100644
--- a/browser/app/js/objects/ObjectsHeader.js
+++ b/browser/app/js/objects/ObjectsHeader.js
@@ -23,7 +23,7 @@ export const ObjectsHeader = ({
   sortNameOrder,
   sortSizeOrder,
   sortLastModifiedOrder,
-  sortObjects,
+  sortObjects
 }) => (
   <div className="objects__row objects__header hidden-xs">
     <div
@@ -38,7 +38,7 @@ export const ObjectsHeader = ({
           objects__sort: true,
           zmdi: true,
           "zmdi-sort-desc": sortNameOrder,
-          "zmdi-sort-asc": !sortNameOrder,
+          "zmdi-sort-asc": !sortNameOrder
         })}
       />
     </div>
@@ -54,7 +54,7 @@ export const ObjectsHeader = ({
           objects__sort: true,
           zmdi: true,
           "zmdi-sort-amount-desc": sortSizeOrder,
-          "zmdi-sort-amount-asc": !sortSizeOrder,
+          "zmdi-sort-amount-asc": !sortSizeOrder
         })}
       />
     </div>
@@ -70,7 +70,7 @@ export const ObjectsHeader = ({
           objects__sort: true,
           zmdi: true,
           "zmdi-sort-amount-desc": sortLastModifiedOrder,
-          "zmdi-sort-amount-asc": !sortLastModifiedOrder,
+          "zmdi-sort-amount-asc": !sortLastModifiedOrder
         })}
       />
     </div>
@@ -82,13 +82,13 @@ const mapStateToProps = state => {
     sortNameOrder: state.objects.sortBy == "name" && state.objects.sortOrder,
     sortSizeOrder: state.objects.sortBy == "size" && state.objects.sortOrder,
     sortLastModifiedOrder:
-      state.objects.sortBy == "last-modified" && state.objects.sortOrder,
+      state.objects.sortBy == "last-modified" && state.objects.sortOrder
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    sortObjects: sortBy => dispatch(actionsObjects.sortObjects(sortBy)),
+    sortObjects: sortBy => dispatch(actionsObjects.sortObjects(sortBy))
   }
 }
 
diff --git a/browser/app/js/objects/ObjectsListContainer.js b/browser/app/js/objects/ObjectsListContainer.js
index 6a31ae390..8518d6ca7 100644
--- a/browser/app/js/objects/ObjectsListContainer.js
+++ b/browser/app/js/objects/ObjectsListContainer.js
@@ -54,16 +54,16 @@ const mapStateToProps = state => {
     currentBucket: state.buckets.currentBucket,
     currentPrefix: state.objects.currentPrefix,
     objects: state.objects.list,
-    isTruncated: state.objects.isTruncated,
+    isTruncated: state.objects.isTruncated
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    loadObjects: append => dispatch(actionsObjects.fetchObjects(append)),
+    loadObjects: append => dispatch(actionsObjects.fetchObjects(append))
   }
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(
-  ObjectsListContainer,
+  ObjectsListContainer
 )
diff --git a/browser/app/js/objects/Path.js b/browser/app/js/objects/Path.js
index 3ff36ade5..b46bc9293 100644
--- a/browser/app/js/objects/Path.js
+++ b/browser/app/js/objects/Path.js
@@ -53,13 +53,13 @@ export const Path = ({ currentBucket, currentPrefix, selectPrefix }) => {
 const mapStateToProps = state => {
   return {
     currentBucket: getCurrentBucket(state),
-    currentPrefix: state.objects.currentPrefix,
+    currentPrefix: state.objects.currentPrefix
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    selectPrefix: prefix => dispatch(actionsObjects.selectPrefix(prefix)),
+    selectPrefix: prefix => dispatch(actionsObjects.selectPrefix(prefix))
   }
 }
 
diff --git a/browser/app/js/objects/PrefixContainer.js b/browser/app/js/objects/PrefixContainer.js
index 62e60b6c4..78dacc2ca 100644
--- a/browser/app/js/objects/PrefixContainer.js
+++ b/browser/app/js/objects/PrefixContainer.js
@@ -23,7 +23,7 @@ export const PrefixContainer = ({ object, currentPrefix, selectPrefix }) => {
   const props = {
     name: object.name,
     contentType: object.contentType,
-    onClick: () => selectPrefix(`${currentPrefix}${object.name}`),
+    onClick: () => selectPrefix(`${currentPrefix}${object.name}`)
   }
 
   return <ObjectItem {...props} />
@@ -32,13 +32,13 @@ export const PrefixContainer = ({ object, currentPrefix, selectPrefix }) => {
 const mapStateToProps = (state, ownProps) => {
   return {
     object: ownProps.object,
-    currentPrefix: state.objects.currentPrefix,
+    currentPrefix: state.objects.currentPrefix
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    selectPrefix: prefix => dispatch(actionsObjects.selectPrefix(prefix)),
+    selectPrefix: prefix => dispatch(actionsObjects.selectPrefix(prefix))
   }
 }
 
diff --git a/browser/app/js/objects/ShareObjectModal.js b/browser/app/js/objects/ShareObjectModal.js
index 34b8a8d9d..0474745b1 100644
--- a/browser/app/js/objects/ShareObjectModal.js
+++ b/browser/app/js/objects/ShareObjectModal.js
@@ -24,7 +24,7 @@ import * as alertActions from "../alert/actions"
 import {
   SHARE_OBJECT_EXPIRY_DAYS,
   SHARE_OBJECT_EXPIRY_HOURS,
-  SHARE_OBJECT_EXPIRY_MINUTES,
+  SHARE_OBJECT_EXPIRY_MINUTES
 } from "../constants"
 
 export class ShareObjectModal extends React.Component {
@@ -34,22 +34,22 @@ export class ShareObjectModal extends React.Component {
       expiry: {
         days: SHARE_OBJECT_EXPIRY_DAYS,
         hours: SHARE_OBJECT_EXPIRY_HOURS,
-        minutes: SHARE_OBJECT_EXPIRY_MINUTES,
-      },
+        minutes: SHARE_OBJECT_EXPIRY_MINUTES
+      }
     }
     this.expiryRange = {
       days: {
         min: 0,
-        max: 7,
+        max: 7
       },
       hours: {
         min: 0,
-        max: 23,
+        max: 23
       },
       minutes: {
         min: 0,
-        max: 59,
-      },
+        max: 59
+      }
     }
   }
 
@@ -75,7 +75,7 @@ export class ShareObjectModal extends React.Component {
     }
 
     this.setState({
-      expiry,
+      expiry
     })
 
     const { shareObjectDetails: { object }, shareObject } = this.props
@@ -207,7 +207,7 @@ export class ShareObjectModal extends React.Component {
 
 const mapStateToProps = (state, ownProps) => {
   return {
-    shareObjectDetails: state.objects.shareObject,
+    shareObjectDetails: state.objects.shareObject
   }
 }
 
@@ -220,9 +220,9 @@ const mapDispatchToProps = dispatch => {
       dispatch(
         alertActions.set({
           type: "success",
-          message: message,
-        }),
-      ),
+          message: message
+        })
+      )
   }
 }
 
diff --git a/browser/app/js/objects/ObjectsBulkActions.js b/browser/app/js/objects/Toolbar.js
similarity index 90%
rename from browser/app/js/objects/ObjectsBulkActions.js
rename to browser/app/js/objects/Toolbar.js
index fcfff4351..085b77c47 100644
--- a/browser/app/js/objects/ObjectsBulkActions.js
+++ b/browser/app/js/objects/Toolbar.js
@@ -28,14 +28,14 @@ import * as objectsActions from "./actions"
 import {
   SHARE_OBJECT_EXPIRY_DAYS,
   SHARE_OBJECT_EXPIRY_HOURS,
-  SHARE_OBJECT_EXPIRY_MINUTES,
+  SHARE_OBJECT_EXPIRY_MINUTES
 } from "../constants"
 
-export class ObjectsBulkActions extends React.Component {
+export class Toolbar extends React.Component {
   constructor(props) {
     super(props)
     this.state = {
-      showDeleteConfirmation: false,
+      showDeleteConfirmation: false
     }
   }
   deleteChecked() {
@@ -45,7 +45,7 @@ export class ObjectsBulkActions extends React.Component {
   }
   hideDeleteConfirmModal() {
     this.setState({
-      showDeleteConfirmation: false,
+      showDeleteConfirmation: false
     })
   }
   shareObject(e) {
@@ -59,7 +59,7 @@ export class ObjectsBulkActions extends React.Component {
       object,
       SHARE_OBJECT_EXPIRY_DAYS,
       SHARE_OBJECT_EXPIRY_HOURS,
-      SHARE_OBJECT_EXPIRY_MINUTES,
+      SHARE_OBJECT_EXPIRY_MINUTES
     )
   }
 
@@ -68,7 +68,7 @@ export class ObjectsBulkActions extends React.Component {
       checkedObjectsCount,
       downloadChecked,
       object,
-      showShareObjectModal,
+      showShareObjectModal
     } = this.props
     const loggedIn = web.LoggedIn()
 
@@ -79,7 +79,7 @@ export class ObjectsBulkActions extends React.Component {
           className="toolbar__item zmdi zmdi-delete"
           onClick={() =>
             this.setState({
-              showDeleteConfirmation: true,
+              showDeleteConfirmation: true
             })
           }
           disabled={!checkedObjectsCount}
@@ -126,7 +126,7 @@ const mapStateToProps = state => {
   return {
     checkedObjects: getCheckedList(state),
     checkedObjectsCount: getCheckedList(state).length,
-    showShareObjectModal: state.objects.shareObject.show,
+    showShareObjectModal: state.objects.shareObject.show
   }
 }
 
@@ -137,8 +137,8 @@ const mapDispatchToProps = dispatch => {
     deleteChecked: () => dispatch(actions.deleteCheckedObjects()),
     toggleSidebar: () => dispatch(actionsCommon.toggleSidebar()),
     shareObject: (object, days, hours, minutes) =>
-      dispatch(objectsActions.shareObject(object, days, hours, minutes)),
+      dispatch(objectsActions.shareObject(object, days, hours, minutes))
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(ObjectsBulkActions)
+export default connect(mapStateToProps, mapDispatchToProps)(Toolbar)
diff --git a/browser/app/js/objects/__tests__/DeleteObjectConfirmModal.test.js b/browser/app/js/objects/__tests__/DeleteObjectConfirmModal.test.js
index 86f2637ec..d5536a225 100644
--- a/browser/app/js/objects/__tests__/DeleteObjectConfirmModal.test.js
+++ b/browser/app/js/objects/__tests__/DeleteObjectConfirmModal.test.js
@@ -26,7 +26,7 @@ describe("DeleteObjectConfirmModal", () => {
   it("should call deleteObject when Delete is clicked", () => {
     const deleteObject = jest.fn()
     const wrapper = shallow(
-      <DeleteObjectConfirmModal deleteObject={deleteObject} />,
+      <DeleteObjectConfirmModal deleteObject={deleteObject} />
     )
     wrapper.find("ConfirmModal").prop("okHandler")()
     expect(deleteObject).toHaveBeenCalled()
@@ -37,7 +37,7 @@ describe("DeleteObjectConfirmModal", () => {
     const wrapper = shallow(
       <DeleteObjectConfirmModal
         hideDeleteConfirmModal={hideDeleteConfirmModal}
-      />,
+      />
     )
     wrapper.find("ConfirmModal").prop("cancelHandler")()
     expect(hideDeleteConfirmModal).toHaveBeenCalled()
diff --git a/browser/app/js/objects/__tests__/ObjectContainer.test.js b/browser/app/js/objects/__tests__/ObjectContainer.test.js
index fd95aad29..f3f276329 100644
--- a/browser/app/js/objects/__tests__/ObjectContainer.test.js
+++ b/browser/app/js/objects/__tests__/ObjectContainer.test.js
@@ -28,28 +28,4 @@ describe("ObjectContainer", () => {
     expect(wrapper.find("Connect(ObjectItem)").length).toBe(1)
     expect(wrapper.find("Connect(ObjectItem)").prop("name")).toBe("test1.jpg")
   })
-
-  it("should pass actions to ObjectItem", () => {
-    const wrapper = shallow(
-      <ObjectContainer
-        object={{ name: "test1.jpg" }}
-        checkedObjectsCount={0}
-      />,
-    )
-    expect(wrapper.find("Connect(ObjectItem)").prop("actionButtons")).not.toBe(
-      undefined,
-    )
-  })
-
-  it("should pass empty actions to ObjectItem when checkedObjectCount is more than 0", () => {
-    const wrapper = shallow(
-      <ObjectContainer
-        object={{ name: "test1.jpg" }}
-        checkedObjectsCount={1}
-      />,
-    )
-    expect(wrapper.find("Connect(ObjectItem)").prop("actionButtons")).toBe(
-      undefined,
-    )
-  })
 })
diff --git a/browser/app/js/objects/__tests__/ObjectItem.test.js b/browser/app/js/objects/__tests__/ObjectItem.test.js
index a46744bdd..405485cd7 100644
--- a/browser/app/js/objects/__tests__/ObjectItem.test.js
+++ b/browser/app/js/objects/__tests__/ObjectItem.test.js
@@ -25,14 +25,16 @@ describe("ObjectItem", () => {
 
   it("should render with content type", () => {
     const wrapper = shallow(<ObjectItem name={"test.jpg"} contentType={""} />)
-    expect(wrapper.prop("data-type")).toBe("image")
+    expect(
+      wrapper.find(".objects__column--select").prop("data-object-type")
+    ).toBe("image")
   })
 
   it("should call onClick when the object isclicked", () => {
     const onClick = jest.fn()
     const wrapper = shallow(<ObjectItem name={"test"} onClick={onClick} />)
     wrapper.find("a").simulate("click", {
-      preventDefault: jest.fn(),
+      preventDefault: jest.fn()
     })
     expect(onClick).toHaveBeenCalled()
   })
@@ -40,7 +42,7 @@ describe("ObjectItem", () => {
   it("should call checkObject when the object/prefix is checked", () => {
     const checkObject = jest.fn()
     const wrapper = shallow(
-      <ObjectItem name={"test"} checked={false} checkObject={checkObject} />,
+      <ObjectItem name={"test"} checked={false} checkObject={checkObject} />
     )
     wrapper.find("input[type='checkbox']").simulate("change")
     expect(checkObject).toHaveBeenCalledWith("test")
@@ -54,7 +56,7 @@ describe("ObjectItem", () => {
   it("should call uncheckObject when the object/prefix is unchecked", () => {
     const uncheckObject = jest.fn()
     const wrapper = shallow(
-      <ObjectItem name={"test"} checked={true} uncheckObject={uncheckObject} />,
+      <ObjectItem name={"test"} checked={true} uncheckObject={uncheckObject} />
     )
     wrapper.find("input[type='checkbox']").simulate("change")
     expect(uncheckObject).toHaveBeenCalledWith("test")
diff --git a/browser/app/js/objects/__tests__/ObjectsHeader.test.js b/browser/app/js/objects/__tests__/ObjectsHeader.test.js
index 542a6196c..51cf877ca 100644
--- a/browser/app/js/objects/__tests__/ObjectsHeader.test.js
+++ b/browser/app/js/objects/__tests__/ObjectsHeader.test.js
@@ -28,43 +28,43 @@ describe("ObjectsHeader", () => {
     const sortObjects = jest.fn()
     const wrapper = shallow(<ObjectsHeader sortObjects={sortObjects} />)
     expect(
-      wrapper.find("#sort-by-name i").hasClass("fa-sort-alpha-asc"),
+      wrapper.find("#sort-by-name i").hasClass("zmdi-sort-asc")
     ).toBeTruthy()
     expect(
-      wrapper.find("#sort-by-size i").hasClass("fa-sort-amount-asc"),
+      wrapper.find("#sort-by-size i").hasClass("zmdi-sort-amount-asc")
     ).toBeTruthy()
     expect(
-      wrapper.find("#sort-by-last-modified i").hasClass("fa-sort-numeric-asc"),
+      wrapper.find("#sort-by-last-modified i").hasClass("zmdi-sort-amount-asc")
     ).toBeTruthy()
   })
 
   it("should render name column with desc class when objects are sorted by name", () => {
     const sortObjects = jest.fn()
     const wrapper = shallow(
-      <ObjectsHeader sortObjects={sortObjects} sortNameOrder={true} />,
+      <ObjectsHeader sortObjects={sortObjects} sortNameOrder={true} />
     )
     expect(
-      wrapper.find("#sort-by-name i").hasClass("fa-sort-alpha-desc"),
+      wrapper.find("#sort-by-name i").hasClass("zmdi-sort-desc")
     ).toBeTruthy()
   })
 
   it("should render size column with desc class when objects are sorted by size", () => {
     const sortObjects = jest.fn()
     const wrapper = shallow(
-      <ObjectsHeader sortObjects={sortObjects} sortSizeOrder={true} />,
+      <ObjectsHeader sortObjects={sortObjects} sortSizeOrder={true} />
     )
     expect(
-      wrapper.find("#sort-by-size i").hasClass("fa-sort-amount-desc"),
+      wrapper.find("#sort-by-size i").hasClass("zmdi-sort-amount-desc")
     ).toBeTruthy()
   })
 
   it("should render last modified column with desc class when objects are sorted by last modified", () => {
     const sortObjects = jest.fn()
     const wrapper = shallow(
-      <ObjectsHeader sortObjects={sortObjects} sortLastModifiedOrder={true} />,
+      <ObjectsHeader sortObjects={sortObjects} sortLastModifiedOrder={true} />
     )
     expect(
-      wrapper.find("#sort-by-last-modified i").hasClass("fa-sort-numeric-desc"),
+      wrapper.find("#sort-by-last-modified i").hasClass("zmdi-sort-amount-desc")
     ).toBeTruthy()
   })
 
diff --git a/browser/app/js/objects/__tests__/ObjectsList.test.js b/browser/app/js/objects/__tests__/ObjectsList.test.js
index 99670041c..72bb3eed1 100644
--- a/browser/app/js/objects/__tests__/ObjectsList.test.js
+++ b/browser/app/js/objects/__tests__/ObjectsList.test.js
@@ -25,14 +25,14 @@ describe("ObjectsList", () => {
 
   it("should render ObjectContainer for every object", () => {
     const wrapper = shallow(
-      <ObjectsList objects={[{ name: "test1.jpg" }, { name: "test2.jpg" }]} />,
+      <ObjectsList objects={[{ name: "test1.jpg" }, { name: "test2.jpg" }]} />
     )
     expect(wrapper.find("Connect(ObjectContainer)").length).toBe(2)
   })
 
   it("should render PrefixContainer for every prefix", () => {
     const wrapper = shallow(
-      <ObjectsList objects={[{ name: "abc/" }, { name: "xyz/" }]} />,
+      <ObjectsList objects={[{ name: "abc/" }, { name: "xyz/" }]} />
     )
     expect(wrapper.find("Connect(PrefixContainer)").length).toBe(2)
   })
diff --git a/browser/app/js/objects/__tests__/ObjectsListContainer.test.js b/browser/app/js/objects/__tests__/ObjectsListContainer.test.js
index 871c5d15a..6fbf1d2f3 100644
--- a/browser/app/js/objects/__tests__/ObjectsListContainer.test.js
+++ b/browser/app/js/objects/__tests__/ObjectsListContainer.test.js
@@ -28,26 +28,26 @@ describe("ObjectsList", () => {
       <ObjectsListContainer
         objects={[{ name: "test1.jpg" }, { name: "test2.jpg" }]}
         loadObjects={jest.fn()}
-      />,
+      />
     )
     expect(wrapper.find("ObjectsList").length).toBe(1)
     expect(wrapper.find("ObjectsList").prop("objects")).toEqual([
       {
-        name: "test1.jpg",
+        name: "test1.jpg"
       },
       {
-        name: "test2.jpg",
-      },
+        name: "test2.jpg"
+      }
     ])
   })
 
   it("should show the loading indicator at the bottom if there are more elements to display", () => {
     const wrapper = shallow(
-      <ObjectsListContainer currentBucket="test1" isTruncated={true} />,
+      <ObjectsListContainer currentBucket="test1" isTruncated={true} />
     )
     expect(wrapper.find(".text-center").prop("style")).toHaveProperty(
       "display",
-      "block",
+      "block"
     )
   })
 })
diff --git a/browser/app/js/objects/__tests__/Path.test.js b/browser/app/js/objects/__tests__/Path.test.js
index edaa5d088..08257a1b7 100644
--- a/browser/app/js/objects/__tests__/Path.test.js
+++ b/browser/app/js/objects/__tests__/Path.test.js
@@ -25,32 +25,32 @@ describe("Path", () => {
 
   it("should render only bucket if there is no prefix", () => {
     const wrapper = shallow(<Path currentBucket={"test1"} currentPrefix={""} />)
-    expect(wrapper.find("span").length).toBe(1)
+    expect(wrapper.find("a").length).toBe(1)
     expect(wrapper.text()).toBe("test1")
   })
 
   it("should render bucket and prefix", () => {
     const wrapper = shallow(
-      <Path currentBucket={"test1"} currentPrefix={"a/b/"} />,
+      <Path currentBucket={"test1"} currentPrefix={"a/b/"} />
     )
-    expect(wrapper.find("span").length).toBe(3)
+    expect(wrapper.find("a").length).toBe(3)
     expect(
       wrapper
-        .find("span")
+        .find("a")
         .at(0)
-        .text(),
+        .text()
     ).toBe("test1")
     expect(
       wrapper
-        .find("span")
+        .find("a")
         .at(1)
-        .text(),
+        .text()
     ).toBe("a")
     expect(
       wrapper
-        .find("span")
+        .find("a")
         .at(2)
-        .text(),
+        .text()
     ).toBe("b")
   })
 
@@ -61,13 +61,13 @@ describe("Path", () => {
         currentBucket={"test1"}
         currentPrefix={"a/b/"}
         selectPrefix={selectPrefix}
-      />,
+      />
     )
     wrapper
       .find("a")
       .at(2)
       .simulate("click", {
-        preventDefault: jest.fn(),
+        preventDefault: jest.fn()
       })
     expect(selectPrefix).toHaveBeenCalledWith("a/b/")
   })
diff --git a/browser/app/js/objects/__tests__/PrefixContainer.test.js b/browser/app/js/objects/__tests__/PrefixContainer.test.js
index 516912cdd..7ae27a0bb 100644
--- a/browser/app/js/objects/__tests__/PrefixContainer.test.js
+++ b/browser/app/js/objects/__tests__/PrefixContainer.test.js
@@ -36,7 +36,7 @@ describe("PrefixContainer", () => {
         object={{ name: "abc/" }}
         currentPrefix={"xyz/"}
         selectPrefix={selectPrefix}
-      />,
+      />
     )
     wrapper.find("Connect(ObjectItem)").prop("onClick")()
     expect(selectPrefix).toHaveBeenCalledWith("xyz/abc/")
diff --git a/browser/app/js/objects/__tests__/ShareObjectModal.test.js b/browser/app/js/objects/__tests__/ShareObjectModal.test.js
index c81b2b1bd..25f238528 100644
--- a/browser/app/js/objects/__tests__/ShareObjectModal.test.js
+++ b/browser/app/js/objects/__tests__/ShareObjectModal.test.js
@@ -20,13 +20,13 @@ import { ShareObjectModal } from "../ShareObjectModal"
 import {
   SHARE_OBJECT_EXPIRY_DAYS,
   SHARE_OBJECT_EXPIRY_HOURS,
-  SHARE_OBJECT_EXPIRY_MINUTES,
+  SHARE_OBJECT_EXPIRY_MINUTES
 } from "../../constants"
 
 jest.mock("../../web", () => ({
   LoggedIn: jest.fn(() => {
     return true
-  }),
+  })
 }))
 
 describe("ShareObjectModal", () => {
@@ -35,7 +35,7 @@ describe("ShareObjectModal", () => {
       <ShareObjectModal
         object={{ name: "obj1" }}
         shareObjectDetails={{ show: true, object: "obj1", url: "test" }}
-      />,
+      />
     )
   })
 
@@ -46,7 +46,7 @@ describe("ShareObjectModal", () => {
         object={{ name: "obj1" }}
         shareObjectDetails={{ show: true, object: "obj1", url: "test" }}
         hideShareObject={hideShareObject}
-      />,
+      />
     )
     wrapper
       .find("button")
@@ -60,13 +60,13 @@ describe("ShareObjectModal", () => {
       <ShareObjectModal
         object={{ name: "obj1" }}
         shareObjectDetails={{ show: true, object: "obj1", url: "test" }}
-      />,
+      />
     )
     expect(
       wrapper
         .find("input")
         .first()
-        .prop("value"),
+        .prop("value")
     ).toBe(`${window.location.protocol}//test`)
   })
 
@@ -79,7 +79,7 @@ describe("ShareObjectModal", () => {
         shareObjectDetails={{ show: true, object: "obj1", url: "test" }}
         hideShareObject={hideShareObject}
         showCopyAlert={showCopyAlert}
-      />,
+      />
     )
     wrapper.find("CopyToClipboard").prop("onCopy")()
     expect(showCopyAlert).toHaveBeenCalledWith("Link copied to clipboard!")
@@ -89,40 +89,40 @@ describe("ShareObjectModal", () => {
   describe("Update expiry values", () => {
     const props = {
       object: {
-        name: "obj1",
+        name: "obj1"
       },
       shareObjectDetails: {
         show: true,
         object: "obj1",
-        url: "test",
-      },
+        url: "test"
+      }
     }
     it("should have default expiry values", () => {
       const wrapper = shallow(<ShareObjectModal {...props} />)
       expect(wrapper.state("expiry")).toEqual({
         days: SHARE_OBJECT_EXPIRY_DAYS,
         hours: SHARE_OBJECT_EXPIRY_HOURS,
-        minutes: SHARE_OBJECT_EXPIRY_MINUTES,
+        minutes: SHARE_OBJECT_EXPIRY_MINUTES
       })
     })
 
     it("should not allow any increments when days is already max", () => {
       const shareObject = jest.fn()
       const wrapper = shallow(
-        <ShareObjectModal {...props} shareObject={shareObject} />,
+        <ShareObjectModal {...props} shareObject={shareObject} />
       )
       wrapper.setState({
         expiry: {
           days: 7,
           hours: 0,
-          minutes: 0,
-        },
+          minutes: 0
+        }
       })
       wrapper.find("#increase-hours").simulate("click")
       expect(wrapper.state("expiry")).toEqual({
         days: 7,
         hours: 0,
-        minutes: 0,
+        minutes: 0
       })
       expect(shareObject).not.toHaveBeenCalled()
     })
@@ -130,14 +130,14 @@ describe("ShareObjectModal", () => {
     it("should not allow expiry values less than minimum value", () => {
       const shareObject = jest.fn()
       const wrapper = shallow(
-        <ShareObjectModal {...props} shareObject={shareObject} />,
+        <ShareObjectModal {...props} shareObject={shareObject} />
       )
       wrapper.setState({
         expiry: {
           days: 5,
           hours: 0,
-          minutes: 0,
-        },
+          minutes: 0
+        }
       })
       wrapper.find("#decrease-hours").simulate("click")
       expect(wrapper.state("expiry").hours).toBe(0)
@@ -149,14 +149,14 @@ describe("ShareObjectModal", () => {
     it("should not allow expiry values more than maximum value", () => {
       const shareObject = jest.fn()
       const wrapper = shallow(
-        <ShareObjectModal {...props} shareObject={shareObject} />,
+        <ShareObjectModal {...props} shareObject={shareObject} />
       )
       wrapper.setState({
         expiry: {
           days: 1,
           hours: 23,
-          minutes: 59,
-        },
+          minutes: 59
+        }
       })
       wrapper.find("#increase-hours").simulate("click")
       expect(wrapper.state("expiry").hours).toBe(23)
@@ -168,20 +168,20 @@ describe("ShareObjectModal", () => {
     it("should set hours and minutes to 0 when days reaches max", () => {
       const shareObject = jest.fn()
       const wrapper = shallow(
-        <ShareObjectModal {...props} shareObject={shareObject} />,
+        <ShareObjectModal {...props} shareObject={shareObject} />
       )
       wrapper.setState({
         expiry: {
           days: 6,
           hours: 5,
-          minutes: 30,
-        },
+          minutes: 30
+        }
       })
       wrapper.find("#increase-days").simulate("click")
       expect(wrapper.state("expiry")).toEqual({
         days: 7,
         hours: 0,
-        minutes: 0,
+        minutes: 0
       })
       expect(shareObject).toHaveBeenCalled()
     })
@@ -189,20 +189,20 @@ describe("ShareObjectModal", () => {
     it("should set days to MAX when all of them becomes 0", () => {
       const shareObject = jest.fn()
       const wrapper = shallow(
-        <ShareObjectModal {...props} shareObject={shareObject} />,
+        <ShareObjectModal {...props} shareObject={shareObject} />
       )
       wrapper.setState({
         expiry: {
           days: 0,
           hours: 1,
-          minutes: 0,
-        },
+          minutes: 0
+        }
       })
       wrapper.find("#decrease-hours").simulate("click")
       expect(wrapper.state("expiry")).toEqual({
         days: 7,
         hours: 0,
-        minutes: 0,
+        minutes: 0
       })
       expect(shareObject).toHaveBeenCalledWith("obj1", 7, 0, 0)
     })
diff --git a/browser/app/js/objects/__tests__/ObjectsBulkActions.test.js b/browser/app/js/objects/__tests__/Toolbar.test.js
similarity index 51%
rename from browser/app/js/objects/__tests__/ObjectsBulkActions.test.js
rename to browser/app/js/objects/__tests__/Toolbar.test.js
index 2838f32e5..0b7f7adb4 100644
--- a/browser/app/js/objects/__tests__/ObjectsBulkActions.test.js
+++ b/browser/app/js/objects/__tests__/Toolbar.test.js
@@ -16,45 +16,38 @@
 
 import React from "react"
 import { shallow } from "enzyme"
-import { ObjectsBulkActions } from "../ObjectsBulkActions"
+import { Toolbar } from "../Toolbar"
 
-describe("ObjectsBulkActions", () => {
+jest.mock("../../web", () => ({
+  LoggedIn: jest
+    .fn(() => true)
+    .mockReturnValueOnce(true)
+    .mockReturnValueOnce(false)
+}))
+
+describe("Toolbar", () => {
   it("should render without crashing", () => {
-    shallow(<ObjectsBulkActions checkedObjectsCount={0} />)
+    shallow(<Toolbar checkedObjectsCount={0} />)
   })
 
-  it("should show actions when checkObjectsCount is more than 0", () => {
-    const wrapper = shallow(<ObjectsBulkActions checkedObjectsCount={1} />)
-    expect(wrapper.hasClass("list-actions-toggled")).toBeTruthy()
+  it("should render Login button when the user has not LoggedIn", () => {
+    const wrapper = shallow(<Toolbar checkedObjectsCount={0} />)
+    expect(wrapper.find("a").text()).toBe("Login")
   })
 
-  it("should call downloadChecked when download button is clicked", () => {
-    const downloadChecked = jest.fn()
-    const wrapper = shallow(
-      <ObjectsBulkActions
-        checkedObjectsCount={1}
-        downloadChecked={downloadChecked}
-      />,
-    )
-    wrapper.find("#download-checked").simulate("click")
-    expect(downloadChecked).toHaveBeenCalled()
+  it("should render StorageInfo and BrowserDropdown when the user has LoggedIn", () => {
+    const wrapper = shallow(<Toolbar checkedObjectsCount={0} />)
+    expect(wrapper.find("Connect(BrowserDropdown)").length).toBe(1)
   })
 
-  it("should call clearChecked when close button is clicked", () => {
-    const clearChecked = jest.fn()
-    const wrapper = shallow(
-      <ObjectsBulkActions
-        checkedObjectsCount={1}
-        clearChecked={clearChecked}
-      />,
-    )
-    wrapper.find("#close-bulk-actions").simulate("click")
-    expect(clearChecked).toHaveBeenCalled()
+  it("should enable delete action when checkObjectsCount is more than 0", () => {
+    const wrapper = shallow(<Toolbar checkedObjectsCount={1} />)
+    expect(wrapper.find(".zmdi-delete").prop("disabled")).toBeFalsy()
   })
 
-  it("shoud show DeleteObjectConfirmModal when delete-checked button is clicked", () => {
-    const wrapper = shallow(<ObjectsBulkActions checkedObjectsCount={1} />)
-    wrapper.find("#delete-checked").simulate("click")
+  it("shoud show DeleteObjectConfirmModal when delete button is clicked", () => {
+    const wrapper = shallow(<Toolbar checkedObjectsCount={1} />)
+    wrapper.find("button.zmdi-delete").simulate("click")
     wrapper.update()
     expect(wrapper.find("DeleteObjectConfirmModal").length).toBe(1)
   })
@@ -62,16 +55,22 @@ describe("ObjectsBulkActions", () => {
   it("shoud call deleteChecked when Delete is clicked on confirmation modal", () => {
     const deleteChecked = jest.fn()
     const wrapper = shallow(
-      <ObjectsBulkActions
-        checkedObjectsCount={1}
-        deleteChecked={deleteChecked}
-      />,
+      <Toolbar checkedObjectsCount={1} deleteChecked={deleteChecked} />
     )
-    wrapper.find("#delete-checked").simulate("click")
+    wrapper.find("button.zmdi-delete").simulate("click")
     wrapper.update()
     wrapper.find("DeleteObjectConfirmModal").prop("deleteObject")()
     expect(deleteChecked).toHaveBeenCalled()
     wrapper.update()
     expect(wrapper.find("DeleteObjectConfirmModal").length).toBe(0)
   })
+
+  it("should call downloadChecked when download button is clicked", () => {
+    const downloadChecked = jest.fn()
+    const wrapper = shallow(
+      <Toolbar checkedObjectsCount={1} downloadChecked={downloadChecked} />
+    )
+    wrapper.find("button.zmdi-download").simulate("click")
+    expect(downloadChecked).toHaveBeenCalled()
+  })
 })
diff --git a/browser/app/js/objects/__tests__/actions.test.js b/browser/app/js/objects/__tests__/actions.test.js
index 8ffbc4a2f..3a2b831ef 100644
--- a/browser/app/js/objects/__tests__/actions.test.js
+++ b/browser/app/js/objects/__tests__/actions.test.js
@@ -26,21 +26,21 @@ jest.mock("../../web", () => ({
     return Promise.resolve({
       objects: [
         {
-          name: "test1",
+          name: "test1"
         },
         {
-          name: "test2",
-        },
+          name: "test2"
+        }
       ],
       istruncated: false,
       nextmarker: "test2",
-      writable: false,
+      writable: false
     })
   }),
   RemoveObject: jest.fn(({ bucketName, objects }) => {
     if (!bucketName) {
       return Promise.reject({
-        message: "Invalid bucket",
+        message: "Invalid bucket"
       })
     }
     return Promise.resolve({})
@@ -48,30 +48,30 @@ jest.mock("../../web", () => ({
   PresignedGet: jest.fn(({ bucket, object }) => {
     if (!bucket) {
       return Promise.reject({
-        message: "Invalid bucket",
+        message: "Invalid bucket"
       })
     }
     return Promise.resolve({
-      url: "https://test.com/bk1/pre1/b.txt",
+      url: "https://test.com/bk1/pre1/b.txt"
     })
   }),
   CreateURLToken: jest
     .fn()
     .mockImplementationOnce(() => {
       return Promise.resolve({
-        token: "test",
+        token: "test"
       })
     })
     .mockImplementationOnce(() => {
       return Promise.reject({
-        message: "Error in creating token",
+        message: "Error in creating token"
       })
     })
     .mockImplementationOnce(() => {
       return Promise.resolve({
-        token: "test",
+        token: "test"
       })
-    }),
+    })
 }))
 
 const middlewares = [thunk]
@@ -85,29 +85,29 @@ describe("Objects actions", () => {
         type: "objects/SET_LIST",
         objects: [
           {
-            name: "test1",
+            name: "test1"
           },
           {
-            name: "test2",
-          },
+            name: "test2"
+          }
         ],
         isTruncated: false,
-        marker: "test2",
-      },
+        marker: "test2"
+      }
     ]
     store.dispatch(
       actionsObjects.setList(
         [
           {
-            name: "test1",
+            name: "test1"
           },
           {
-            name: "test2",
-          },
+            name: "test2"
+          }
         ],
         "test2",
-        false,
-      ),
+        false
+      )
     )
     const actions = store.getActions()
     expect(actions).toEqual(expectedActions)
@@ -118,8 +118,8 @@ describe("Objects actions", () => {
     const expectedActions = [
       {
         type: "objects/SET_SORT_BY",
-        sortBy: "name",
-      },
+        sortBy: "name"
+      }
     ]
     store.dispatch(actionsObjects.setSortBy("name"))
     const actions = store.getActions()
@@ -131,8 +131,8 @@ describe("Objects actions", () => {
     const expectedActions = [
       {
         type: "objects/SET_SORT_ORDER",
-        sortOrder: true,
-      },
+        sortOrder: true
+      }
     ]
     store.dispatch(actionsObjects.setSortOrder(true))
     const actions = store.getActions()
@@ -142,38 +142,38 @@ describe("Objects actions", () => {
   it("creates objects/SET_LIST after fetching the objects", () => {
     const store = mockStore({
       buckets: {
-        currentBucket: "bk1",
+        currentBucket: "bk1"
       },
       objects: {
-        currentPrefix: "",
-      },
+        currentPrefix: ""
+      }
     })
     const expectedActions = [
       {
         type: "objects/SET_LIST",
         objects: [
           {
-            name: "test1",
+            name: "test1"
           },
           {
-            name: "test2",
-          },
+            name: "test2"
+          }
         ],
         marker: "test2",
-        isTruncated: false,
+        isTruncated: false
       },
       {
         type: "objects/SET_SORT_BY",
-        sortBy: "",
+        sortBy: ""
       },
       {
         type: "objects/SET_SORT_ORDER",
-        sortOrder: false,
+        sortOrder: false
       },
       {
         type: "objects/SET_PREFIX_WRITABLE",
-        prefixWritable: false,
-      },
+        prefixWritable: false
+      }
     ]
     return store.dispatch(actionsObjects.fetchObjects()).then(() => {
       const actions = store.getActions()
@@ -184,30 +184,30 @@ describe("Objects actions", () => {
   it("creates objects/APPEND_LIST after fetching more objects", () => {
     const store = mockStore({
       buckets: {
-        currentBucket: "bk1",
+        currentBucket: "bk1"
       },
       objects: {
-        currentPrefix: "",
-      },
+        currentPrefix: ""
+      }
     })
     const expectedActions = [
       {
         type: "objects/APPEND_LIST",
         objects: [
           {
-            name: "test1",
+            name: "test1"
           },
           {
-            name: "test2",
-          },
+            name: "test2"
+          }
         ],
         marker: "test2",
-        isTruncated: false,
+        isTruncated: false
       },
       {
         type: "objects/SET_PREFIX_WRITABLE",
-        prefixWritable: false,
-      },
+        prefixWritable: false
+      }
     ]
     return store.dispatch(actionsObjects.fetchObjects(true)).then(() => {
       const actions = store.getActions()
@@ -222,24 +222,24 @@ describe("Objects actions", () => {
         sortBy: "",
         sortOrder: false,
         isTruncated: false,
-        marker: "",
-      },
+        marker: ""
+      }
     })
     const expectedActions = [
       {
         type: "objects/SET_SORT_BY",
-        sortBy: "name",
+        sortBy: "name"
       },
       {
         type: "objects/SET_SORT_ORDER",
-        sortOrder: true,
+        sortOrder: true
       },
       {
         type: "objects/SET_LIST",
         objects: [],
         isTruncated: false,
-        marker: "",
-      },
+        marker: ""
+      }
     ]
     store.dispatch(actionsObjects.sortObjects("name"))
     const actions = store.getActions()
@@ -249,20 +249,20 @@ describe("Objects actions", () => {
   it("should update browser url and creates objects/SET_CURRENT_PREFIX and objects/CHECKED_LIST_RESET actions when selectPrefix is called", () => {
     const store = mockStore({
       buckets: {
-        currentBucket: "test",
+        currentBucket: "test"
       },
       objects: {
-        currentPrefix: "",
-      },
+        currentPrefix: ""
+      }
     })
     const expectedActions = [
       {
         type: "objects/SET_CURRENT_PREFIX",
-        prefix: "abc/",
+        prefix: "abc/"
       },
       {
-        type: "objects/CHECKED_LIST_RESET",
-      },
+        type: "objects/CHECKED_LIST_RESET"
+      }
     ]
     store.dispatch(actionsObjects.selectPrefix("abc/"))
     const actions = store.getActions()
@@ -275,8 +275,8 @@ describe("Objects actions", () => {
     const expectedActions = [
       {
         type: "objects/SET_PREFIX_WRITABLE",
-        prefixWritable: true,
-      },
+        prefixWritable: true
+      }
     ]
     store.dispatch(actionsObjects.setPrefixWritable(true))
     const actions = store.getActions()
@@ -288,8 +288,8 @@ describe("Objects actions", () => {
     const expectedActions = [
       {
         type: "objects/REMOVE",
-        object: "obj1",
-      },
+        object: "obj1"
+      }
     ]
     store.dispatch(actionsObjects.removeObject("obj1"))
     const actions = store.getActions()
@@ -299,17 +299,17 @@ describe("Objects actions", () => {
   it("creates objects/REMOVE action when object is deleted", () => {
     const store = mockStore({
       buckets: {
-        currentBucket: "test",
+        currentBucket: "test"
       },
       objects: {
-        currentPrefix: "pre1/",
-      },
+        currentPrefix: "pre1/"
+      }
     })
     const expectedActions = [
       {
         type: "objects/REMOVE",
-        object: "obj1",
-      },
+        object: "obj1"
+      }
     ]
     store.dispatch(actionsObjects.deleteObject("obj1")).then(() => {
       const actions = store.getActions()
@@ -320,11 +320,11 @@ describe("Objects actions", () => {
   it("creates alert/SET action when invalid bucket is provided", () => {
     const store = mockStore({
       buckets: {
-        currentBucket: "",
+        currentBucket: ""
       },
       objects: {
-        currentPrefix: "pre1/",
-      },
+        currentPrefix: "pre1/"
+      }
     })
     const expectedActions = [
       {
@@ -332,9 +332,9 @@ describe("Objects actions", () => {
         alert: {
           type: "danger",
           message: "Invalid bucket",
-          id: 0,
-        },
-      },
+          id: 0
+        }
+      }
     ]
     return store.dispatch(actionsObjects.deleteObject("obj1")).then(() => {
       const actions = store.getActions()
@@ -349,8 +349,8 @@ describe("Objects actions", () => {
         type: "objects/SET_SHARE_OBJECT",
         show: true,
         object: "b.txt",
-        url: "test",
-      },
+        url: "test"
+      }
     ]
     store.dispatch(actionsObjects.showShareObject("b.txt", "test"))
     const actions = store.getActions()
@@ -364,8 +364,8 @@ describe("Objects actions", () => {
         type: "objects/SET_SHARE_OBJECT",
         show: false,
         object: "",
-        url: "",
-      },
+        url: ""
+      }
     ]
     store.dispatch(actionsObjects.hideShareObject())
     const actions = store.getActions()
@@ -375,27 +375,27 @@ describe("Objects actions", () => {
   it("creates objects/SET_SHARE_OBJECT when object is shared", () => {
     const store = mockStore({
       buckets: {
-        currentBucket: "bk1",
+        currentBucket: "bk1"
       },
       objects: {
-        currentPrefix: "pre1/",
-      },
+        currentPrefix: "pre1/"
+      }
     })
     const expectedActions = [
       {
         type: "objects/SET_SHARE_OBJECT",
         show: true,
         object: "a.txt",
-        url: "https://test.com/bk1/pre1/b.txt",
+        url: "https://test.com/bk1/pre1/b.txt"
       },
       {
         type: "alert/SET",
         alert: {
           type: "success",
           message: "Object shared. Expires in 1 days 0 hours 0 minutes",
-          id: alertActions.alertId,
-        },
-      },
+          id: alertActions.alertId
+        }
+      }
     ]
     return store
       .dispatch(actionsObjects.shareObject("a.txt", 1, 0, 0))
@@ -408,11 +408,11 @@ describe("Objects actions", () => {
   it("creates alert/SET when shareObject is failed", () => {
     const store = mockStore({
       buckets: {
-        currentBucket: "",
+        currentBucket: ""
       },
       objects: {
-        currentPrefix: "pre1/",
-      },
+        currentPrefix: "pre1/"
+      }
     })
     const expectedActions = [
       {
@@ -420,9 +420,9 @@ describe("Objects actions", () => {
         alert: {
           type: "danger",
           message: "Invalid bucket",
-          id: alertActions.alertId,
-        },
-      },
+          id: alertActions.alertId
+        }
+      }
     ]
     return store
       .dispatch(actionsObjects.shareObject("a.txt", 1, 0, 0))
@@ -438,15 +438,15 @@ describe("Objects actions", () => {
       Object.defineProperty(window, "location", {
         set(url) {
           setLocation(url)
-        },
+        }
       })
       const store = mockStore({
         buckets: {
-          currentBucket: "bk1",
+          currentBucket: "bk1"
         },
         objects: {
-          currentPrefix: "pre1/",
-        },
+          currentPrefix: "pre1/"
+        }
       })
       store.dispatch(actionsObjects.downloadObject("obj1"))
       const url = `${
@@ -460,21 +460,21 @@ describe("Objects actions", () => {
       Object.defineProperty(window, "location", {
         set(url) {
           setLocation(url)
-        },
+        }
       })
       const store = mockStore({
         buckets: {
-          currentBucket: "bk1",
+          currentBucket: "bk1"
         },
         objects: {
-          currentPrefix: "pre1/",
-        },
+          currentPrefix: "pre1/"
+        }
       })
       return store.dispatch(actionsObjects.downloadObject("obj1")).then(() => {
         const url = `${
           window.location.origin
         }${minioBrowserPrefix}/download/bk1/${encodeURI(
-          "pre1/obj1",
+          "pre1/obj1"
         )}?token=test`
         expect(setLocation).toHaveBeenCalledWith(url)
       })
@@ -483,11 +483,11 @@ describe("Objects actions", () => {
     it("create alert/SET action when CreateUrlToken fails", () => {
       const store = mockStore({
         buckets: {
-          currentBucket: "bk1",
+          currentBucket: "bk1"
         },
         objects: {
-          currentPrefix: "pre1/",
-        },
+          currentPrefix: "pre1/"
+        }
       })
       const expectedActions = [
         {
@@ -495,9 +495,9 @@ describe("Objects actions", () => {
           alert: {
             type: "danger",
             message: "Error in creating token",
-            id: alertActions.alertId,
-          },
-        },
+            id: alertActions.alertId
+          }
+        }
       ]
       return store.dispatch(actionsObjects.downloadObject("obj1")).then(() => {
         const actions = store.getActions()
@@ -511,8 +511,8 @@ describe("Objects actions", () => {
     const expectedActions = [
       {
         type: "objects/CHECKED_LIST_ADD",
-        object: "obj1",
-      },
+        object: "obj1"
+      }
     ]
     store.dispatch(actionsObjects.checkObject("obj1"))
     const actions = store.getActions()
@@ -524,8 +524,8 @@ describe("Objects actions", () => {
     const expectedActions = [
       {
         type: "objects/CHECKED_LIST_REMOVE",
-        object: "obj1",
-      },
+        object: "obj1"
+      }
     ]
     store.dispatch(actionsObjects.uncheckObject("obj1"))
     const actions = store.getActions()
@@ -536,8 +536,8 @@ describe("Objects actions", () => {
     const store = mockStore()
     const expectedActions = [
       {
-        type: "objects/CHECKED_LIST_RESET",
-      },
+        type: "objects/CHECKED_LIST_RESET"
+      }
     ]
     store.dispatch(actionsObjects.resetCheckedList())
     const actions = store.getActions()
@@ -549,18 +549,18 @@ describe("Objects actions", () => {
     const send = jest.fn()
     const xhrMockClass = () => ({
       open: open,
-      send: send,
+      send: send
     })
     window.XMLHttpRequest = jest.fn().mockImplementation(xhrMockClass)
 
     const store = mockStore({
       buckets: {
-        currentBucket: "bk1",
+        currentBucket: "bk1"
       },
       objects: {
         currentPrefix: "pre1/",
-        checkedList: ["obj1"],
-      },
+        checkedList: ["obj1"]
+      }
     })
     return store.dispatch(actionsObjects.downloadCheckedObjects()).then(() => {
       const requestUrl = `${
@@ -571,8 +571,8 @@ describe("Objects actions", () => {
         JSON.stringify({
           bucketName: "bk1",
           prefix: "pre1/",
-          objects: ["obj1"],
-        }),
+          objects: ["obj1"]
+        })
       )
     })
   })
diff --git a/browser/app/js/objects/__tests__/reducer.test.js b/browser/app/js/objects/__tests__/reducer.test.js
index e66d59565..e95ab3d01 100644
--- a/browser/app/js/objects/__tests__/reducer.test.js
+++ b/browser/app/js/objects/__tests__/reducer.test.js
@@ -31,9 +31,9 @@ describe("objects reducer", () => {
       shareObject: {
         show: false,
         object: "",
-        url: "",
+        url: ""
       },
-      checkedList: [],
+      checkedList: []
     })
   })
 
@@ -42,22 +42,22 @@ describe("objects reducer", () => {
       type: actions.SET_LIST,
       objects: [
         {
-          name: "obj1",
+          name: "obj1"
         },
         {
-          name: "obj2",
-        },
+          name: "obj2"
+        }
       ],
       marker: "obj2",
-      isTruncated: false,
+      isTruncated: false
     })
     expect(newState.list).toEqual([
       {
-        name: "obj1",
+        name: "obj1"
       },
       {
-        name: "obj2",
-      },
+        name: "obj2"
+      }
     ])
     expect(newState.marker).toBe("obj2")
     expect(newState.isTruncated).toBeFalsy()
@@ -68,42 +68,42 @@ describe("objects reducer", () => {
       {
         list: [
           {
-            name: "obj1",
+            name: "obj1"
           },
           {
-            name: "obj2",
-          },
+            name: "obj2"
+          }
         ],
         marker: "obj2",
-        isTruncated: true,
+        isTruncated: true
       },
       {
         type: actions.APPEND_LIST,
         objects: [
           {
-            name: "obj3",
+            name: "obj3"
           },
           {
-            name: "obj4",
-          },
+            name: "obj4"
+          }
         ],
         marker: "obj4",
-        isTruncated: false,
-      },
+        isTruncated: false
+      }
     )
     expect(newState.list).toEqual([
       {
-        name: "obj1",
+        name: "obj1"
       },
       {
-        name: "obj2",
+        name: "obj2"
       },
       {
-        name: "obj3",
+        name: "obj3"
       },
       {
-        name: "obj4",
-      },
+        name: "obj4"
+      }
     ])
     expect(newState.marker).toBe("obj4")
     expect(newState.isTruncated).toBeFalsy()
@@ -114,22 +114,22 @@ describe("objects reducer", () => {
       {
         list: [
           {
-            name: "obj1",
+            name: "obj1"
           },
           {
-            name: "obj2",
-          },
-        ],
+            name: "obj2"
+          }
+        ]
       },
       {
         type: actions.REMOVE,
-        object: "obj1",
-      },
+        object: "obj1"
+      }
     )
     expect(newState.list).toEqual([
       {
-        name: "obj2",
-      },
+        name: "obj2"
+      }
     ])
   })
 
@@ -138,32 +138,32 @@ describe("objects reducer", () => {
       {
         list: [
           {
-            name: "obj1",
+            name: "obj1"
           },
           {
-            name: "obj2",
-          },
-        ],
+            name: "obj2"
+          }
+        ]
       },
       {
         type: actions.REMOVE,
-        object: "obj3",
-      },
+        object: "obj3"
+      }
     )
     expect(newState.list).toEqual([
       {
-        name: "obj1",
+        name: "obj1"
       },
       {
-        name: "obj2",
-      },
+        name: "obj2"
+      }
     ])
   })
 
   it("should handle SET_SORT_BY", () => {
     const newState = reducer(undefined, {
       type: actions.SET_SORT_BY,
-      sortBy: "name",
+      sortBy: "name"
     })
     expect(newState.sortBy).toEqual("name")
   })
@@ -171,7 +171,7 @@ describe("objects reducer", () => {
   it("should handle SET_SORT_ORDER", () => {
     const newState = reducer(undefined, {
       type: actions.SET_SORT_ORDER,
-      sortOrder: true,
+      sortOrder: true
     })
     expect(newState.sortOrder).toEqual(true)
   })
@@ -181,12 +181,12 @@ describe("objects reducer", () => {
       {
         currentPrefix: "test1/",
         marker: "abc",
-        isTruncated: true,
+        isTruncated: true
       },
       {
         type: actions.SET_CURRENT_PREFIX,
-        prefix: "test2/",
-      },
+        prefix: "test2/"
+      }
     )
     expect(newState.currentPrefix).toEqual("test2/")
     expect(newState.marker).toEqual("")
@@ -196,7 +196,7 @@ describe("objects reducer", () => {
   it("should handle SET_PREFIX_WRITABLE", () => {
     const newState = reducer(undefined, {
       type: actions.SET_PREFIX_WRITABLE,
-      prefixWritable: true,
+      prefixWritable: true
     })
     expect(newState.prefixWritable).toBeTruthy()
   })
@@ -206,19 +206,19 @@ describe("objects reducer", () => {
       type: actions.SET_SHARE_OBJECT,
       show: true,
       object: "a.txt",
-      url: "test",
+      url: "test"
     })
     expect(newState.shareObject).toEqual({
       show: true,
       object: "a.txt",
-      url: "test",
+      url: "test"
     })
   })
 
   it("should handle CHECKED_LIST_ADD", () => {
     const newState = reducer(undefined, {
       type: actions.CHECKED_LIST_ADD,
-      object: "obj1",
+      object: "obj1"
     })
     expect(newState.checkedList).toEqual(["obj1"])
   })
@@ -226,12 +226,12 @@ describe("objects reducer", () => {
   it("should handle SELECTED_LIST_REMOVE", () => {
     const newState = reducer(
       {
-        checkedList: ["obj1", "obj2"],
+        checkedList: ["obj1", "obj2"]
       },
       {
         type: actions.CHECKED_LIST_REMOVE,
-        object: "obj1",
-      },
+        object: "obj1"
+      }
     )
     expect(newState.checkedList).toEqual(["obj2"])
   })
@@ -239,11 +239,11 @@ describe("objects reducer", () => {
   it("should handle CHECKED_LIST_RESET", () => {
     const newState = reducer(
       {
-        checkedList: ["obj1", "obj2"],
+        checkedList: ["obj1", "obj2"]
       },
       {
-        type: actions.CHECKED_LIST_RESET,
-      },
+        type: actions.CHECKED_LIST_RESET
+      }
     )
     expect(newState.checkedList).toEqual([])
   })
diff --git a/browser/app/js/objects/actions.js b/browser/app/js/objects/actions.js
index f70f2b893..ced30d70f 100644
--- a/browser/app/js/objects/actions.js
+++ b/browser/app/js/objects/actions.js
@@ -19,7 +19,7 @@ import history from "../history"
 import {
   sortObjectsByName,
   sortObjectsBySize,
-  sortObjectsByDate,
+  sortObjectsByDate
 } from "../utils"
 import { getCurrentBucket } from "../buckets/selectors"
 import { getCurrentPrefix, getCheckedList } from "./selectors"
@@ -42,28 +42,28 @@ export const setList = (objects, marker, isTruncated) => ({
   type: SET_LIST,
   objects,
   marker,
-  isTruncated,
+  isTruncated
 })
 
 export const appendList = (objects, marker, isTruncated) => ({
   type: APPEND_LIST,
   objects,
   marker,
-  isTruncated,
+  isTruncated
 })
 
 export const fetchObjects = append => {
   return function(dispatch, getState) {
     const {
       buckets: { currentBucket },
-      objects: { currentPrefix, marker },
+      objects: { currentPrefix, marker }
     } = getState()
     if (currentBucket) {
       return web
         .ListObjects({
           bucketName: currentBucket,
           prefix: currentPrefix,
-          marker: append ? marker : "",
+          marker: append ? marker : ""
         })
         .then(res => {
           let objects = []
@@ -71,7 +71,7 @@ export const fetchObjects = append => {
             objects = res.objects.map(object => {
               return {
                 ...object,
-                name: object.name.replace(currentPrefix, ""),
+                name: object.name.replace(currentPrefix, "")
               }
             })
           }
@@ -88,8 +88,8 @@ export const fetchObjects = append => {
           dispatch(
             alertActions.set({
               type: "danger",
-              message: err.message,
-            }),
+              message: err.message
+            })
           )
           history.push("/login")
         })
@@ -124,12 +124,12 @@ export const sortObjects = sortBy => {
 
 export const setSortBy = sortBy => ({
   type: SET_SORT_BY,
-  sortBy,
+  sortBy
 })
 
 export const setSortOrder = sortOrder => ({
   type: SET_SORT_ORDER,
-  sortOrder,
+  sortOrder
 })
 
 export const selectPrefix = prefix => {
@@ -145,13 +145,13 @@ export const selectPrefix = prefix => {
 export const setCurrentPrefix = prefix => {
   return {
     type: SET_CURRENT_PREFIX,
-    prefix,
+    prefix
   }
 }
 
 export const setPrefixWritable = prefixWritable => ({
   type: SET_PREFIX_WRITABLE,
-  prefixWritable,
+  prefixWritable
 })
 
 export const deleteObject = object => {
@@ -162,7 +162,7 @@ export const deleteObject = object => {
     return web
       .RemoveObject({
         bucketName: currentBucket,
-        objects: [objectName],
+        objects: [objectName]
       })
       .then(() => {
         dispatch(removeObject(object))
@@ -171,8 +171,8 @@ export const deleteObject = object => {
         dispatch(
           alertActions.set({
             type: "danger",
-            message: e.message,
-          }),
+            message: e.message
+          })
         )
       })
   }
@@ -180,7 +180,7 @@ export const deleteObject = object => {
 
 export const removeObject = object => ({
   type: REMOVE,
-  object,
+  object
 })
 
 export const deleteCheckedObjects = () => {
@@ -204,23 +204,23 @@ export const shareObject = (object, days, hours, minutes) => {
         host: location.host,
         bucket: currentBucket,
         object: objectName,
-        expiry,
+        expiry
       })
       .then(obj => {
         dispatch(showShareObject(object, obj.url))
         dispatch(
           alertActions.set({
             type: "success",
-            message: `Object shared. Expires in ${days} days ${hours} hours ${minutes} minutes`,
-          }),
+            message: `Object shared. Expires in ${days} days ${hours} hours ${minutes} minutes`
+          })
         )
       })
       .catch(err => {
         dispatch(
           alertActions.set({
             type: "danger",
-            message: err.message,
-          }),
+            message: err.message
+          })
         )
       })
   }
@@ -230,14 +230,14 @@ export const showShareObject = (object, url) => ({
   type: SET_SHARE_OBJECT,
   show: true,
   object,
-  url,
+  url
 })
 
 export const hideShareObject = (object, url) => ({
   type: SET_SHARE_OBJECT,
   show: false,
   object: "",
-  url: "",
+  url: ""
 })
 
 export const downloadObject = object => {
@@ -261,8 +261,8 @@ export const downloadObject = object => {
           dispatch(
             alertActions.set({
               type: "danger",
-              message: err.message,
-            }),
+              message: err.message
+            })
           )
         })
     } else {
@@ -276,16 +276,16 @@ export const downloadObject = object => {
 
 export const checkObject = object => ({
   type: CHECKED_LIST_ADD,
-  object,
+  object
 })
 
 export const uncheckObject = object => ({
   type: CHECKED_LIST_REMOVE,
-  object,
+  object
 })
 
 export const resetCheckedList = () => ({
-  type: CHECKED_LIST_RESET,
+  type: CHECKED_LIST_RESET
 })
 
 export const downloadCheckedObjects = () => {
@@ -294,7 +294,7 @@ export const downloadCheckedObjects = () => {
     const req = {
       bucketName: getCurrentBucket(state),
       prefix: getCurrentPrefix(state),
-      objects: getCheckedList(state),
+      objects: getCheckedList(state)
     }
     if (!web.LoggedIn()) {
       const requestUrl = location.origin + "/minio/zip?token=''"
@@ -312,9 +312,9 @@ export const downloadCheckedObjects = () => {
           dispatch(
             alertActions.set({
               type: "danger",
-              message: err.message,
-            }),
-          ),
+              message: err.message
+            })
+          )
         )
     }
   }
@@ -332,7 +332,7 @@ const downloadZip = (url, req, dispatch) => {
     if (this.status == 200) {
       dispatch(resetCheckedList())
       var blob = new Blob([this.response], {
-        type: "octet/stream",
+        type: "octet/stream"
       })
       var blobUrl = window.URL.createObjectURL(blob)
       var separator = req.prefix.length > 1 ? "-" : ""
diff --git a/browser/app/js/objects/reducer.js b/browser/app/js/objects/reducer.js
index 1d2382861..1eab6a7b7 100644
--- a/browser/app/js/objects/reducer.js
+++ b/browser/app/js/objects/reducer.js
@@ -36,11 +36,11 @@ export default (
     shareObject: {
       show: false,
       object: "",
-      url: "",
+      url: ""
     },
-    checkedList: [],
+    checkedList: []
   },
-  action,
+  action
 ) => {
   switch (action.type) {
     case actionsObjects.SET_LIST:
@@ -48,41 +48,41 @@ export default (
         ...state,
         list: action.objects,
         marker: action.marker,
-        isTruncated: action.isTruncated,
+        isTruncated: action.isTruncated
       }
     case actionsObjects.APPEND_LIST:
       return {
         ...state,
         list: [...state.list, ...action.objects],
         marker: action.marker,
-        isTruncated: action.isTruncated,
+        isTruncated: action.isTruncated
       }
     case actionsObjects.REMOVE:
       return {
         ...state,
-        list: removeObject(state.list, action.object, object => object.name),
+        list: removeObject(state.list, action.object, object => object.name)
       }
     case actionsObjects.SET_SORT_BY:
       return {
         ...state,
-        sortBy: action.sortBy,
+        sortBy: action.sortBy
       }
     case actionsObjects.SET_SORT_ORDER:
       return {
         ...state,
-        sortOrder: action.sortOrder,
+        sortOrder: action.sortOrder
       }
     case actionsObjects.SET_CURRENT_PREFIX:
       return {
         ...state,
         currentPrefix: action.prefix,
         marker: "",
-        isTruncated: false,
+        isTruncated: false
       }
     case actionsObjects.SET_PREFIX_WRITABLE:
       return {
         ...state,
-        prefixWritable: action.prefixWritable,
+        prefixWritable: action.prefixWritable
       }
     case actionsObjects.SET_SHARE_OBJECT:
       return {
@@ -90,13 +90,13 @@ export default (
         shareObject: {
           show: action.show,
           object: action.object,
-          url: action.url,
-        },
+          url: action.url
+        }
       }
     case actionsObjects.CHECKED_LIST_ADD:
       return {
         ...state,
-        checkedList: [...state.checkedList, action.object],
+        checkedList: [...state.checkedList, action.object]
       }
     case actionsObjects.CHECKED_LIST_REMOVE:
       return {
@@ -104,13 +104,13 @@ export default (
         checkedList: removeObject(
           state.checkedList,
           action.object,
-          object => object,
-        ),
+          object => object
+        )
       }
     case actionsObjects.CHECKED_LIST_RESET:
       return {
         ...state,
-        checkedList: [],
+        checkedList: []
       }
     default:
       return state
diff --git a/browser/app/js/reducers.js b/browser/app/js/reducers.js
index e90dd73e4..60aac6bd8 100644
--- a/browser/app/js/reducers.js
+++ b/browser/app/js/reducers.js
@@ -26,7 +26,7 @@ const rootReducer = combineReducers({
   alert,
   buckets,
   objects,
-  uploads,
+  uploads
 })
 
 export default rootReducer
diff --git a/browser/app/js/uploads/AbortConfirmModal.js b/browser/app/js/uploads/AbortConfirmModal.js
index 5a3ca59e3..9958d8fb5 100644
--- a/browser/app/js/uploads/AbortConfirmModal.js
+++ b/browser/app/js/uploads/AbortConfirmModal.js
@@ -30,15 +30,15 @@ export class AbortConfirmModal extends React.Component {
   render() {
     const { hideAbort } = this.props
     let baseClass = classNames({
-      "abort-upload": true,
+      "abort-upload": true
     })
     let okIcon = classNames({
       fa: true,
-      "fa-times": true,
+      "fa-times": true
     })
     let cancelIcon = classNames({
       fa: true,
-      "fa-cloud-upload": true,
+      "fa-cloud-upload": true
     })
 
     return (
@@ -61,14 +61,14 @@ export class AbortConfirmModal extends React.Component {
 
 const mapStateToProps = state => {
   return {
-    uploads: state.uploads.files,
+    uploads: state.uploads.files
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
     abort: slug => dispatch(uploadsActions.abortUpload(slug)),
-    hideAbort: () => dispatch(uploadsActions.hideAbortModal()),
+    hideAbort: () => dispatch(uploadsActions.hideAbortModal())
   }
 }
 
diff --git a/browser/app/js/uploads/Dropzone.js b/browser/app/js/uploads/Dropzone.js
index 4b094104a..68e1ab925 100644
--- a/browser/app/js/uploads/Dropzone.js
+++ b/browser/app/js/uploads/Dropzone.js
@@ -51,7 +51,7 @@ export class Dropzone extends React.Component {
 
 const mapDispatchToProps = dispatch => {
   return {
-    uploadFile: file => dispatch(actions.uploadFile(file)),
+    uploadFile: file => dispatch(actions.uploadFile(file))
   }
 }
 
diff --git a/browser/app/js/uploads/UploadModal.js b/browser/app/js/uploads/UploadModal.js
index 75b1546d2..bd4782295 100644
--- a/browser/app/js/uploads/UploadModal.js
+++ b/browser/app/js/uploads/UploadModal.js
@@ -75,13 +75,13 @@ export class UploadModal extends React.Component {
 const mapStateToProps = state => {
   return {
     uploads: state.uploads.files,
-    showAbort: state.uploads.showAbortModal,
+    showAbort: state.uploads.showAbortModal
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    showAbortModal: () => dispatch(uploadsActions.showAbortModal()),
+    showAbortModal: () => dispatch(uploadsActions.showAbortModal())
   }
 }
 
diff --git a/browser/app/js/uploads/__tests__/AbortConfirmModal.test.js b/browser/app/js/uploads/__tests__/AbortConfirmModal.test.js
index 2793726ec..1dcdd99a3 100644
--- a/browser/app/js/uploads/__tests__/AbortConfirmModal.test.js
+++ b/browser/app/js/uploads/__tests__/AbortConfirmModal.test.js
@@ -29,10 +29,10 @@ describe("AbortConfirmModal", () => {
       <AbortConfirmModal
         uploads={{
           "a-b/-test1": { size: 100, loaded: 50, name: "test1" },
-          "a-b/-test2": { size: 100, loaded: 50, name: "test2" },
+          "a-b/-test2": { size: 100, loaded: 50, name: "test2" }
         }}
         abort={abort}
-      />,
+      />
     )
     wrapper.instance().abortUploads()
     expect(abort.mock.calls.length).toBe(2)
diff --git a/browser/app/js/uploads/__tests__/Dropzone.test.js b/browser/app/js/uploads/__tests__/Dropzone.test.js
index 9eeded93c..d5b5d98a5 100644
--- a/browser/app/js/uploads/__tests__/Dropzone.test.js
+++ b/browser/app/js/uploads/__tests__/Dropzone.test.js
@@ -27,10 +27,10 @@ describe("Dropzone", () => {
     const uploadFile = jest.fn()
     const wrapper = shallow(<Dropzone uploadFile={uploadFile} />)
     const file1 = new Blob(["file content1"], {
-      type: "text/plain",
+      type: "text/plain"
     })
     const file2 = new Blob(["file content2"], {
-      type: "text/plain",
+      type: "text/plain"
     })
     wrapper.first().prop("onDrop")([file1, file2])
     expect(uploadFile.mock.calls).toEqual([[file1], [file2]])
diff --git a/browser/app/js/uploads/__tests__/UploadModal.test.js b/browser/app/js/uploads/__tests__/UploadModal.test.js
index 5e86cac76..000593f13 100644
--- a/browser/app/js/uploads/__tests__/UploadModal.test.js
+++ b/browser/app/js/uploads/__tests__/UploadModal.test.js
@@ -37,7 +37,7 @@ describe("UploadModal", () => {
     const wrapper = shallow(
       <UploadModal
         uploads={{ "a-b/-test": { size: 100, loaded: 50, name: "test" } }}
-      />,
+      />
     )
     expect(wrapper.find("ProgressBar").length).toBe(1)
   })
@@ -48,7 +48,7 @@ describe("UploadModal", () => {
       <UploadModal
         uploads={{ "a-b/-test": { size: 100, loaded: 50, name: "test" } }}
         showAbortModal={showAbortModal}
-      />,
+      />
     )
     wrapper.find("button").simulate("click")
     expect(showAbortModal).toHaveBeenCalled()
diff --git a/browser/app/js/uploads/__tests__/actions.test.js b/browser/app/js/uploads/__tests__/actions.test.js
index c125020f0..2f3b65454 100644
--- a/browser/app/js/uploads/__tests__/actions.test.js
+++ b/browser/app/js/uploads/__tests__/actions.test.js
@@ -29,8 +29,8 @@ describe("Uploads actions", () => {
         type: "uploads/ADD",
         slug: "a-b-c",
         size: 100,
-        name: "test",
-      },
+        name: "test"
+      }
     ]
     store.dispatch(uploadsActions.add("a-b-c", 100, "test"))
     const actions = store.getActions()
@@ -43,8 +43,8 @@ describe("Uploads actions", () => {
       {
         type: "uploads/UPDATE_PROGRESS",
         slug: "a-b-c",
-        loaded: 50,
-      },
+        loaded: 50
+      }
     ]
     store.dispatch(uploadsActions.updateProgress("a-b-c", 50))
     const actions = store.getActions()
@@ -56,8 +56,8 @@ describe("Uploads actions", () => {
     const expectedActions = [
       {
         type: "uploads/STOP",
-        slug: "a-b-c",
-      },
+        slug: "a-b-c"
+      }
     ]
     store.dispatch(uploadsActions.stop("a-b-c"))
     const actions = store.getActions()
@@ -69,8 +69,8 @@ describe("Uploads actions", () => {
     const expectedActions = [
       {
         type: "uploads/SHOW_ABORT_MODAL",
-        show: true,
-      },
+        show: true
+      }
     ]
     store.dispatch(uploadsActions.showAbortModal())
     const actions = store.getActions()
@@ -79,15 +79,15 @@ describe("Uploads actions", () => {
 
   describe("uploadFile", () => {
     const file = new Blob(["file content"], {
-      type: "text/plain",
+      type: "text/plain"
     })
     file.name = "file1"
 
     it("creates alerts/SET action when currentBucket is not present", () => {
       const store = mockStore({
         buckets: {
-          currentBucket: "",
-        },
+          currentBucket: ""
+        }
       })
       const expectedActions = [
         {
@@ -95,12 +95,12 @@ describe("Uploads actions", () => {
           alert: {
             id: 0,
             type: "danger",
-            message: "Please choose a bucket before trying to upload files.",
-          },
-        },
+            message: "Please choose a bucket before trying to upload files."
+          }
+        }
       ]
       const file = new Blob(["file content"], {
-        type: "text/plain",
+        type: "text/plain"
       })
       store.dispatch(uploadsActions.uploadFile(file))
       const actions = store.getActions()
@@ -110,19 +110,19 @@ describe("Uploads actions", () => {
     it("creates uploads/ADD action before uploading the file", () => {
       const store = mockStore({
         buckets: {
-          currentBucket: "test1",
+          currentBucket: "test1"
         },
         objects: {
-          currentPrefix: "pre1/",
-        },
+          currentPrefix: "pre1/"
+        }
       })
       const expectedActions = [
         {
           type: "uploads/ADD",
           slug: "test1-pre1/-file1",
           size: file.size,
-          name: file.name,
-        },
+          name: file.name
+        }
       ]
       store.dispatch(uploadsActions.uploadFile(file))
       const actions = store.getActions()
@@ -137,23 +137,23 @@ describe("Uploads actions", () => {
         send: send,
         setRequestHeader: jest.fn(),
         upload: {
-          addEventListener: jest.fn(),
-        },
+          addEventListener: jest.fn()
+        }
       })
       window.XMLHttpRequest = jest.fn().mockImplementation(xhrMockClass)
       const store = mockStore({
         buckets: {
-          currentBucket: "test1",
+          currentBucket: "test1"
         },
         objects: {
-          currentPrefix: "pre1/",
-        },
+          currentPrefix: "pre1/"
+        }
       })
       store.dispatch(uploadsActions.uploadFile(file))
       expect(open).toHaveBeenCalledWith(
         "PUT",
         "https://localhost:8080/upload/test1/pre1/file1",
-        true,
+        true
       )
       expect(send).toHaveBeenCalledWith(file)
     })
@@ -164,12 +164,12 @@ describe("Uploads actions", () => {
     const expectedActions = [
       {
         type: "uploads/STOP",
-        slug: "a-b/-c",
+        slug: "a-b/-c"
       },
       {
         type: "uploads/SHOW_ABORT_MODAL",
-        show: false,
-      },
+        show: false
+      }
     ]
     store.dispatch(uploadsActions.abortUpload("a-b/-c"))
     const actions = store.getActions()
diff --git a/browser/app/js/uploads/__tests__/reducer.test.js b/browser/app/js/uploads/__tests__/reducer.test.js
index ee233a076..4314bf503 100644
--- a/browser/app/js/uploads/__tests__/reducer.test.js
+++ b/browser/app/js/uploads/__tests__/reducer.test.js
@@ -22,7 +22,7 @@ describe("uploads reducer", () => {
     const initialState = reducer(undefined, {})
     expect(initialState).toEqual({
       files: {},
-      showAbortModal: false,
+      showAbortModal: false
     })
   })
 
@@ -31,14 +31,14 @@ describe("uploads reducer", () => {
       type: actions.ADD,
       slug: "a-b-c",
       size: 100,
-      name: "test",
+      name: "test"
     })
     expect(newState.files).toEqual({
       "a-b-c": {
         loaded: 0,
         size: 100,
-        name: "test",
-      },
+        name: "test"
+      }
     })
   })
 
@@ -49,22 +49,22 @@ describe("uploads reducer", () => {
           "a-b-c": {
             loaded: 0,
             size: 100,
-            name: "test",
-          },
-        },
+            name: "test"
+          }
+        }
       },
       {
         type: actions.UPDATE_PROGRESS,
         slug: "a-b-c",
-        loaded: 50,
-      },
+        loaded: 50
+      }
     )
     expect(newState.files).toEqual({
       "a-b-c": {
         loaded: 50,
         size: 100,
-        name: "test",
-      },
+        name: "test"
+      }
     })
   })
 
@@ -75,38 +75,38 @@ describe("uploads reducer", () => {
           "a-b-c": {
             loaded: 70,
             size: 100,
-            name: "test1",
+            name: "test1"
           },
           "x-y-z": {
             loaded: 50,
             size: 100,
-            name: "test2",
-          },
-        },
+            name: "test2"
+          }
+        }
       },
       {
         type: actions.STOP,
-        slug: "a-b-c",
-      },
+        slug: "a-b-c"
+      }
     )
     expect(newState.files).toEqual({
       "x-y-z": {
         loaded: 50,
         size: 100,
-        name: "test2",
-      },
+        name: "test2"
+      }
     })
   })
 
   it("should handle SHOW_ABORT_MODAL", () => {
     const newState = reducer(
       {
-        showAbortModal: false,
+        showAbortModal: false
       },
       {
         type: actions.SHOW_ABORT_MODAL,
-        show: true,
-      },
+        show: true
+      }
     )
     expect(newState.showAbortModal).toBeTruthy()
   })
diff --git a/browser/app/js/uploads/actions.js b/browser/app/js/uploads/actions.js
index 393f9cc41..05e9d4208 100644
--- a/browser/app/js/uploads/actions.js
+++ b/browser/app/js/uploads/actions.js
@@ -31,28 +31,28 @@ export const add = (slug, size, name) => ({
   type: ADD,
   slug,
   size,
-  name,
+  name
 })
 
 export const updateProgress = (slug, loaded) => ({
   type: UPDATE_PROGRESS,
   slug,
-  loaded,
+  loaded
 })
 
 export const stop = slug => ({
   type: STOP,
-  slug,
+  slug
 })
 
 export const showAbortModal = () => ({
   type: SHOW_ABORT_MODAL,
-  show: true,
+  show: true
 })
 
 export const hideAbortModal = () => ({
   type: SHOW_ABORT_MODAL,
-  show: false,
+  show: false
 })
 
 let requests = {}
@@ -83,8 +83,8 @@ export const uploadFile = file => {
       dispatch(
         alertActions.set({
           type: "danger",
-          message: "Please choose a bucket before trying to upload files.",
-        }),
+          message: "Please choose a bucket before trying to upload files."
+        })
       )
       return
     }
@@ -102,14 +102,14 @@ export const uploadFile = file => {
     if (token) {
       xhr.setRequestHeader(
         "Authorization",
-        "Bearer " + storage.getItem("token"),
+        "Bearer " + storage.getItem("token")
       )
     }
     xhr.setRequestHeader(
       "x-amz-date",
       Moment()
         .utc()
-        .format("YYYYMMDDTHHmmss") + "Z",
+        .format("YYYYMMDDTHHmmss") + "Z"
     )
 
     dispatch(addUpload(xhr, slug, file.size, file.name))
@@ -121,8 +121,8 @@ export const uploadFile = file => {
         dispatch(
           alertActions.set({
             type: "danger",
-            message: "Unauthorized request.",
-          }),
+            message: "Unauthorized request."
+          })
         )
       }
       if (xhr.status == 500) {
@@ -131,8 +131,8 @@ export const uploadFile = file => {
         dispatch(
           alertActions.set({
             type: "danger",
-            message: xhr.responseText,
-          }),
+            message: xhr.responseText
+          })
         )
       }
       if (xhr.status == 200) {
@@ -141,8 +141,8 @@ export const uploadFile = file => {
         dispatch(
           alertActions.set({
             type: "success",
-            message: "File '" + file.name + "' uploaded successfully.",
-          }),
+            message: "File '" + file.name + "' uploaded successfully."
+          })
         )
         dispatch(objectsActions.selectPrefix(currentPrefix))
       }
@@ -153,8 +153,8 @@ export const uploadFile = file => {
       dispatch(
         alertActions.set({
           type: "danger",
-          message: "Error occurred uploading '" + file.name + "'.",
-        }),
+          message: "Error occurred uploading '" + file.name + "'."
+        })
       )
     })
 
diff --git a/browser/app/js/uploads/reducer.js b/browser/app/js/uploads/reducer.js
index 837700a48..d073ead89 100644
--- a/browser/app/js/uploads/reducer.js
+++ b/browser/app/js/uploads/reducer.js
@@ -21,16 +21,16 @@ const add = (files, action) => ({
   [action.slug]: {
     loaded: 0,
     size: action.size,
-    name: action.name,
-  },
+    name: action.name
+  }
 })
 
 const updateProgress = (files, action) => ({
   ...files,
   [action.slug]: {
     ...files[action.slug],
-    loaded: action.loaded,
-  },
+    loaded: action.loaded
+  }
 })
 
 const stop = (files, action) => {
@@ -42,30 +42,30 @@ const stop = (files, action) => {
 export default (
   state = {
     files: {},
-    showAbortModal: false,
+    showAbortModal: false
   },
-  action,
+  action
 ) => {
   switch (action.type) {
     case uploadsActions.ADD:
       return {
         ...state,
-        files: add(state.files, action),
+        files: add(state.files, action)
       }
     case uploadsActions.UPDATE_PROGRESS:
       return {
         ...state,
-        files: updateProgress(state.files, action),
+        files: updateProgress(state.files, action)
       }
     case uploadsActions.STOP:
       return {
         ...state,
-        files: stop(state.files, action),
+        files: stop(state.files, action)
       }
     case uploadsActions.SHOW_ABORT_MODAL:
       return {
         ...state,
-        showAbortModal: action.show,
+        showAbortModal: action.show
       }
     default:
       return state
diff --git a/browser/app/js/utils.js b/browser/app/js/utils.js
index 8cfc67b68..60c704de4 100644
--- a/browser/app/js/utils.js
+++ b/browser/app/js/utils.js
@@ -49,7 +49,7 @@ export const sortObjectsByDate = (objects, order) => {
   let files = objects.filter(object => !object.name.endsWith("/"))
   files = files.sort(
     (a, b) =>
-      new Date(a.lastModified).getTime() - new Date(b.lastModified).getTime(),
+      new Date(a.lastModified).getTime() - new Date(b.lastModified).getTime()
   )
   if (order) files = files.reverse()
   return [...folders, ...files]
@@ -62,21 +62,21 @@ export const pathSlice = path => {
   if (!path)
     return {
       bucket,
-      prefix,
+      prefix
     }
   let objectIndex = path.indexOf("/", 1)
   if (objectIndex == -1) {
     bucket = path.slice(1)
     return {
       bucket,
-      prefix,
+      prefix
     }
   }
   bucket = path.slice(1, objectIndex)
   prefix = path.slice(objectIndex + 1)
   return {
     bucket,
-    prefix,
+    prefix
   }
 }
 
diff --git a/browser/app/js/web.js b/browser/app/js/web.js
index 10621ab35..170922981 100644
--- a/browser/app/js/web.js
+++ b/browser/app/js/web.js
@@ -24,16 +24,16 @@ class Web {
     const namespace = "Web"
     this.JSONrpc = new JSONrpc({
       endpoint,
-      namespace,
+      namespace
     })
   }
   makeCall(method, options) {
     return this.JSONrpc.call(
       method,
       {
-        params: options,
+        params: options
       },
-      storage.getItem("token"),
+      storage.getItem("token")
     )
       .catch(err => {
         if (err.status === 401) {
@@ -132,7 +132,7 @@ class Web {
 const web = new Web(
   `${window.location.protocol}//${
     window.location.host
-  }${minioBrowserPrefix}/webrpc`,
+  }${minioBrowserPrefix}/webrpc`
 )
 
 export default web