added some OOP and page title