Fix full layout issue