Feature/view refactory

You have a mix of spaces and tab here.

Please use only spaces.