Button and menu improvements