Remove intervals, change layout to table layout