Synced with latest dev; overmap rotation, ui fixes, "v"iewall state save