design tweaks
switched interface from input fields to buttons
added conflict detection