Cleaned up new view.