More styling work

Just cleaning up the styling further