Fix x position of country label when it doesn't have data for final year(s).
Tooltips working and tidied up