Moved button and frame into their own controls.