fix few ui bug