page loading refactored
...