Implemented Need to show end time and end page + have error message i…