Improved map layout. Now as per Plunker