added typography refactored some shit