Trying to get the buttons to be smart

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>