Refactoring of the UI control generation.
Added tabbed UI