remove article; added div
Merge branch 'origin/master'
Bugs fixed. Grid bugs fixed. New tabs. Reordered buttons and forms