Clean up the sidebar button janky-ness