Partial UI integration

ayun
Revert "Partial Integration to UI"

This reverts commit 0d1eed85526b683acc5305a91314b50063ddb678.