Enhance sidebar button layout

Then we don't have duplication here :wink: