[WIP] Extended QS options (1/2)
- Todo: Fix ribbons view

Change-Id: I1e62a6309a4906c3d7f7e3503569fdad8b64ed20