refactored all markup into views namespace