Cleaned up the sidebar

More logical and uniform