Adding OSI information.
Adding some layout.