[#10] Fixed some layout when switching year/aggr. Also added label for aggregated that correctly appears/disappears.