Menu spacing corrections.
Fixed merge conflict