Bug when some pages were not show fixed plus some refactoring made