Refactor less + NProgress