Some reordering and adding gallery to header
merge