Refactoring. (TODO - fixtures and homepage (check for list loaded))