Misc. restructuring
Fixed error in category breadcrumbs
Merge branch 'master' into testing