Trying to fix buttons

Buttons need objects not selectors to simplify things