Added feature image sorting for amenity and gallery. Fix bugs and cleanups.