Some CamelCase refactoring
Re-added relativization of menu positions