Updated more UI