removed unnecessary if in userview twig, other fixes