Galleries & various fixes