Fixes and move high-end gfx