Fixed a bug with my sql/matching interface
Refactored contracts layout, nomenclature
Fixed table mis-reference caused by last refactor
Changfed list layout fallback text, position.
Simplified some var names
Several incompatability fixes relating to uris
Refactored and removed unnecessary code.
Fixed URI conversion
Removed unused import