Update buttons variable names, and Add clearBtn

Signed-off-by: Antti-Ville Jokela <antti-ville@avjokela.eu>
Fix indent

Signed-off-by: Antti-Ville Jokela <antti-ville@avjokela.eu>