Fixed some errors from #62

I changed the sidebar to match the tabs and cleaned up the code.