[IMP] Manufacturing : Improved some usability issues.

[imp]