Added column with time in queue; Some design fixes