fix user cell selected issue; a few random improvements