Trying to fix new session/instrument/goal view