reworkButtonsLayout