feature/1499_button-placement