Develop

small refactor and add ui-router