Minor refactoring

Sarting to ship out some generic UI components to separate DLL.