More CSS Cleanup