More styling and restructuring