Small changes to cleanup view.