ui issues fixed