better buttons
pretty much done