Map - initial styling and markup.
Merge remote-tracking branch 'origin/master'