Doc UI tweaks cleanup