Revert "Merge branch 'UI-modification'"

This reverts commit 6b7cb59c65f155ce73baa9b83a89549aa4ba145c, reversing
changes made to b8781a0caaa00ae9e510af6690c9068476697cb6.