Improve CSS and markup to center content