better presentation and menu button organization