Fixed timer and added UI adjustments
Fixed timer and added UI adjustments