Merge commit
after merge CSS fixes
Headder margin added to CSS (for beta spacing)