Refractoring to single view.