fixed #21 detailed view refactored