Another partial commit. More styling