More UI reorganization.