layout and company switch issues