Improved UIManager