Some styling and structure updates