Added custom font, cleanup, bug fixes