Refactored clock widget