Added attack buttons
Merge fix