Add ending dates, make layout standardized and sane