user icon and some small fix