Moved Layout to BaseStateManager