Fixing 15/16 problem and timeline display