Fixed UI visibility bugs with XP