attempted to use as much generic view as possible. the previous views were generic anyway. also did some managing of inheritance (extends/includes)
