basic styling done for specials
bloody dots
dots done
fixed merge conflicts
Merge branch 'dev' into Richard
Fix JS merge conflicts