fixes on cases, changes on routs and dashboard features
Merge origin/master