Fix issue 8 (reorganize menus)

At least mostly. No "Select All" option yet.