Pulled over changes to the help and ui from p4 workspace.