Feature/view refactory

Remove this