Improved grid movement and layer gen