Major re-design of views classes -- cleaner heirarchy without duplication.