added timeremaining
removed unused view