Added in simple overlay and detail views
Removed earlier refactored code