CSS Clean up and style changes