pull request to merge in recent UI work