Feature/improved view