fixed some UI bugs