Revert "ui seperated"

This reverts commit 6f0fb479f083b57c4771f0a100fb47d562dc903f.
fb