Minor improvements + camera mode in menu