refactoring states, urls & template names