Restructured UI more.