Landing page fixes merge with main xavier branch