More changes from earlier discussions re: UI