Fixed and merged in db changes
Final adjust to fix all
Modiftying buttons and deleting .nfs files
merge
merge again