Layout update to add external controls and full screen map

Still need to coordinate options and state