UI updates, cleanup