button color
button spacing
rename index
index changes
resolve merge conflict