timer & UI changes
timer & UI changes