Fixes in Gallery, added filters, Edit functionality