Button and exit added