Fixed piece buttons not behaving correctly