More changes to fix topic locator and styles