fixed bug with dashboard, need some unit testsgit status
fixed some bugs