--Hr-247 - Implement view mode