add yearborder, tooltip, refactoring