Moved buttons and implemented cancel button