refactor variables name
Add multiple gallery support