Some User UI Fixs