GK: view refactor