Feature/dashboard improvments