Added proper cancel buttons