Renamed the view class.
Minor adjustments.