t840 - fixing broken buttons