move forms into separate file and start cleaning up form display