last minute tweaky tweaks + add category page
Merge branch 'matt-tweaks'