Updated forms, view logic and relationships