more refactoring, add better spacing to view files