fixed dashboard, kinda.
managed merge conflicts