Merge branch 'dev'
Update template UI when categories move places