Changed to ui-router for greater flexibility