Add location
Fix gallery