dashboard now uses real forms
fixed merge conflict