Swap to using text views all round