More markup and styling
Updated