Cleanup code.
Added new views.