Remove CountDown Controller and refactor views