Minor code cleanup, also adjusted a incorrect font in the UI.