Changes to layout and inline code style