Added Singleton classes and synced other pages with main page