moved a label and then moved it back.
Merge branch 'NickOfTime_Timer'