upgrade gradle and fix up button