PILOT-60 Update sketch file to only use 1 font. Reorganize symbols and f...

...ix some minor bugs