Cleaned up some Views. Leaving off..