Button group state quickfix, implemented modal view close event