Page loader and bug fixes