Issue: Css fixes