Neaten up spacing of admin bar in main site context.
Whitespace changes.
 Cleanup popup notices.

Move HTML to view from controller, use same elements for other country
popup and everypage - partly so they don't display on top of each other
anymore. Don't position them over existing content, position them at the
top of the page. Use consistent styling, and keep the javascript
unobtrusive.
Merge branch 'feature/cleanup-popups' into wdtk