More code refactoring, object page now more optimised