Working on usability
 * added cancel and restart buttons