Move some buttons around,
add a Country select directive