Add directives
Fix home controller
Fix controllers