Hotfix:
- Fix problem with Long years
- Fix layout