More clean up

Made the  question dialog cleaner