Fixed header bugs
Merge branch 'master' of github.com:Magmoz/Core
fixed Grid bugs