WF-1609, WF-1640 - Fixed, Combobox implemented for user and substitute, style changes.