fixed names and converted divs to buttons