Homepage content updates
Fix conflict etc