More CSS and Formatting changes