fine tuning some styles, moved basic map function back to home
.
resolved merge conflicts
.