Fixed messy CSS and markup