some ui issue fixed