Merge "Work on QS layouts"