Added Typography and spacing