Updates to mostly UI toolkit pages