Merge pull request #12 from curtisharvey/master

floorplan fixes and retina logo setup
small tweaks to nav bar