Updated modal $scope
Added models for some other circumstances
Will merge in design before proceeding