More changes to fix topic locator and styles
Merge branch 'feature/Reserves' into develop

* feature/Reserves:
  More changes to fix topic locator and styles