redo ui
Revert "redo ui"

This reverts commit f9ff763fe9bc52c0cce8df5956e494285bdf3afa.
products clean
cleaned up merge