major working page refactoring has been done to adopt new functions system