Adding map and fixing layout.