Linear layout improvements, among other things