fix merge conflict
fix merge conflict
better mobile styles for announcement and features separation