UI autoupdate and small improvements