Cleanup and tweaks to the ImageryWidget

Still have to write unit tests.