Restructure database, add 'remove' and 'complete' buttons