Some widget fixes
Main button changing Mode when OK