Fixing and reorganizing views.