views load greatly improved, refactoring