Improve table layout