Added cancel option and second axis size selection