added tweaks and styling css
Merge branch 'master' into development_a