Pokemon UI Fixes