removed custom mapping combo box and refactoring
better predefined mapping combo box