Refactor file and template names of the view form; Bugfixing