table css fix
error page points to article, js + css change
merge conflict