UI improvement with one-off working