More options and clearing up the menu