Added Map, added screen resize