added changes to Menu and buttons