btn changes on index, and small tweaks
btn changes, minor tweaks