Updated layout. Changed upcoming to use table.