Random stuff

- Template import / export command
- Refactored layouts to be more efficient
- Allow classes to be passed to block menu
Merge remote-tracking branch 'origin/master'