clean up of view logic, added composer, and twig templates
clean up of view logic, added composer, and twig templates
clean up of view logic, added composer, and twig templates
clean up of view logic, added composer, and twig templates
resolving merge conflict