gallery done, popup almost done
popup done