Improved DetailView - issue #4, Fix issue #3