UI fixes in UserModule