Fixes and added dashboard;