Fixed Expedition views and removed reference to groups. Added cancel buttons.