Accept and cancel button fix #