made some finishing tweaks to homepage
merged local with master