updated question render
fix merge conflict
updated dash board according to new design