Minor improvements in button layout