changed vh to % in style.css
merged