CSS and small bug correction