still working on styling
Merge branch 'master' into styling
lots of changes in styling
Merge master onto styling