Worked on #561 forms views and models