removed DIVs to make the grid more fluid
Merge origin/master