Minor refactoring of application factory and template loading order