Finishing dashboard
Merging branch