reworking ui-router