change menu and about us, add estimator page
merge dashboard