Added cancel button
Got rid of logging