some ui imporvements