0.011 UI cleanup, and added the maps back in