Improve table layouts