Fixes exerciseTime bug. UI improvements