Layout fixes of timer

Still need to modify text, add divider lines