Rollback to Gallery module and UI change