Changed button positions

And changed how clicking on them is handled