New fonts, cleaned up file structure, query form tweaks