Layout fixes in /Spaces and /Gallery, changed data structure in /spaces