updating index, and some css
Merge branch 'master' into post_angular
second draft.... needs editing before posting