organization view; $state.goBack(); smaller fixes;