Moved topbar to sidebar and other tweaks