Added quit button (needs a little tweaking)
Amend: quit button