Re-adjusted styling and markup