Doc UI updates
more Doc UI updates