Refactor timer, use bar instead of pie