added the done button functionality
Merge branch 'createsecurity' into testing