Layout 2 flex fixes