Adds amenities macro, update FA
Fix Amenities update