Change to original layout and style

Remove CR