remove unneccessary date tags, rename layouts for clarity