Finished view refactor.