Feature/improve public views