Various UI updates (to be continued)