Better handling of small screens
Better handling of small screens for the map
Added IB and PATRIOT