Renamed View and Draw class