styling fonts colors divs etc
Merge branch 'stylinggridetc'
pulled changes and merged show conflicts