Changes to sidebar and button layout.
Need to start on the dialogs