Changes to fix new styles
More changes to fix styles