Refactor/redesign counter ui