added cancel button
Merge branch 'doc_overhaul' into testing