Pull nav bar out of main template as partial
Remove debug
Tweaks to country template rendering and form
Rollback switch to 2.2.2-RC2 since inc. compilation seems to be busted.