Font, form 2 changes

David stop whining
Merge
Merged