user controller change + ui bug fix