Fixing instructions layout