Use scrollable in some still not migrated places