GPII-271: Some css bugs fixed