Text fixes and split layout