Updated to simple UI