User interface improved. (without comunication to server)