CSS Improvement & correction