Fixed styling and also changed more stuff into buttons