More styling stuff and more changes