Add Dashboard properties
Fix Conflicts
ambot