Adding some base typography styles
Rearranging structure a bit