Added typography & more