Fixes for issue #68 , UI changes T1hr:00