move remaining ui calls to main q