more UI XMLization.
more UI XMLization.
and remove extra verification.