Improve scenario model class
Order times in popup