Sidebar and Clean up

Clean up and and main sidebar addition