Dev Clean up mark-up and CSS to improve accessability and visual layout