UI updates, function improvements