buttons editted some minor design added
merge conflicts in index.html fixed