Refactor, rejuvinate JS
Adding user bundle