Various updates, removed HTML5BP, restructured grids
Fixing conflicts