Cleanup white space.
Cleanup menu for Schema Creator.
Merge branch 'develop'