Fix layout structure
Add ogps