Modified item layout

This makes it easier to test when the ImageSwitcher goes offscreen but
the row is still visible.