Fixes #14, #13, calendar chart nav and changed the legends