Fixed messy tables