More styling and some token stuff