New "categories" dropdown and updated CSS
Updated stuff

updated my css and js
merge master and fix conflicts
Updated layout and css
Merge remote-tracking branch 'origin/master' into Richard
Merge pull request #4 from dan753722/Richard

Update CSS & Layout