fixed dashboard
merging changes
equipmentS typo