Fixed UI expand issue