UI updates, alert fixes