moved admin
fixed merge conflicts
added div ids and classes to galleries page