Resolve UI Bugs