More visual changes
merge fix