Fixed the bug that does 1:00 -> 0:60
TODO - Redesign screen