added new forms plus minor ui changes