Fix layout and update post punc.