Moved the buttons and removed debug code

forgot activate the code again to remove non civs from the drop down
list - for testing on my local its easier if I can charge myself with a
crime.