Added buttons, and cleaned menu