Fix QS Layout

Change-Id: I93c647e3a6b4028cfad75a46670f301380f173b0