Did some improvements in CSS