minor cleanup
change buttons