Added update forms for subject, user, fixes some related issues