css bugs fixed & improve