Enhance sidebar button layout

:bow: