Add tzinfo-data for Windows compatibility
Fix layouts