Adding  some basic styles
Cleaning up the templates some more
Merge branch 'feature/header' into develop