Updated EndTime to Controller methods. Minor bugfix and minor UI
changing.