Minor model/controller cleanup and initial form setup.