Refactoring: allmodules in ui or model
Renaming og method names
smart templating
template fixing
Template