Topic: modernized button layout