Fixed UI-Pro Problems