Began fixing the control views to work with the new architecture.