Detail views

Merge detailViews branch into develop.