Final tweaks to forms and database loading script