Select fixes on Edit
Merge pull request #63 from Useful-Innovation/davids-fixes

Select fixes on Edit