UI re-factorization