More CSS cleanup and formatting