Started refactoring genre form