Clean up and Bindings

Set bindings to two way where needed. Did some clean up on space.

Added button clicks for add and cancel in add new combatant.