Refactor Clock application to support two clock faces