add reset and basic index pages
resolve merge conflixt