Feature/simplified views