using react grid
updated css
formatted grid
fixed preview bug
Merge branch 'previewHotFix' into dev