dashboard links are working
fixed merge conflicts