Issue #161 - Fixing the controller
Issue #161 - Fixing the twig files