Refactor/less and updated dependencies