Remove horizontal layout related instructions, plus minor edits.