Updated structure and styling