Code refactor, fixed add/edit visuals, added fonts