Cleanup, Removing calendar_table layout and generating it dynamically in code
2.05