Refined home page and gallery page
Merging conflicts