Feature/view refactory