Fixing page content loading
Refactoring and new classes