changed menu for better usability