fine tuning some styles, moved basic map function back to home
.
resolved merge conflicts
.
Merge pull request #50 from tarynsauer/map_app_branch

Map app branch