Worked on some forms and bugfixes