Improve Gallery Feature