RC : Bring back scrollable toggles

Change-Id: Icc080fa6c31a2a9658313ed27fe177882fc18c69
Signed-off-by: Zaphod <mwilson@acesappraisal.com>