Buttons states

@tdaffron Can you check this out?