Added map, status and map windows to new window support.