fixs some UI bugs