Updated News designer files
Fixed merge conflicts