Copy changes
copy changes
Merge branch 'master' into blogg
Updated styling