sooo much refactoring the view

testing