Added map below timeline, fixed style
Merge branch 're-add-map'