modify the estimator page and change a url in routes
add edit button for device
resolve merge conflicts
fix the extra conflict
enhance dashboard