Consolidated more models and popups.  A bit of cleanup.