Another pass on den UI