Restructured some views.