Focus set on entry box and more cleaning of old elements