Moved more forms and actions into appropriate places.