move more stuff to +dashboard
fix undefined variable