DA-37: Finished fixing the improper truncating in the layout.