Some css fixes & more