diff --git a/lib/components/Method/method.html b/lib/components/Method/method.html
index d434709757..20d908a5a3 100644
--- a/lib/components/Method/method.html
+++ b/lib/components/Method/method.html
@@ -22,9 +22,8 @@ <h5 class="http-method" [ngClass]="method.httpMethod">{{method.httpMethod}}</h5>
   --></span>
     </div>
 
-    <div *ngIf="method.bodyParam">
-        <br>
-        <request-samples [pointer]="pointer" [schemaPointer]="method.bodyParam._pointer">
+    <div>
+        <request-samples [pointer]="pointer" [schemaPointer]="method.bodyParam?._pointer">
         </request-samples>
     </div>
     <div>
diff --git a/lib/components/Method/method.scss b/lib/components/Method/method.scss
index 2fcadd4ba3..af11795fd7 100644
--- a/lib/components/Method/method.scss
+++ b/lib/components/Method/method.scss
@@ -5,6 +5,7 @@
   padding-bottom: 100px;
   display: block;
   border-bottom: 1px solid rgba(127, 127, 127, 0.25);
+  margin-top: 1em;
 }
 
 :host:last-of-type {
diff --git a/lib/components/RequestSamples/request-samples.html b/lib/components/RequestSamples/request-samples.html
index ea370552d5..8f4956cdf2 100644
--- a/lib/components/RequestSamples/request-samples.html
+++ b/lib/components/RequestSamples/request-samples.html
@@ -1,7 +1,7 @@
 <header *ngIf="schemaPointer || samples.length"> Request samples </header>
-<schema-sample *ngIf="!samples.length" [skipReadOnly]="true" [pointer]="schemaPointer"> </schema-sample>
+<schema-sample *ngIf="schemaPointer && !samples.length" [skipReadOnly]="true" [pointer]="schemaPointer"> </schema-sample>
 <tabs *ngIf="samples.length" [selected] = "selectedLang" (change)=changeLangNotify($event)>
-  <tab tabTitle="JSON">
+  <tab *ngIf="schemaPointer" tabTitle="JSON">
     <schema-sample [pointer]="schemaPointer" [skipReadOnly]="true"> </schema-sample>
   </tab>
   <tab *ngFor="let sample of samples" [tabTitle]="sample.lang">
diff --git a/lib/components/RequestSamples/request-samples.ts b/lib/components/RequestSamples/request-samples.ts
index 159d291d42..14651d5456 100644
--- a/lib/components/RequestSamples/request-samples.ts
+++ b/lib/components/RequestSamples/request-samples.ts
@@ -1,7 +1,7 @@
 'use strict';
 
 import { Component, ViewChildren, QueryList, EventEmitter, Input,
- ChangeDetectionStrategy, OnInit } from '@angular/core';
+ ChangeDetectionStrategy, OnInit, HostBinding } from '@angular/core';
 
 import { BaseComponent, SpecManager } from '../base';
 import JsonPointer from '../../utils/JsonPointer';
@@ -18,6 +18,7 @@ export class RequestSamples extends BaseComponent implements OnInit {
   @Input() pointer:string;
   @Input() schemaPointer:string;
   @ViewChildren(Tabs) childQuery:QueryList<Tabs>;
+  @HostBinding('attr.hidden') hidden;
 
   childTabs: Tabs;
   selectedLang: EventEmitter<any>;
@@ -35,8 +36,9 @@ export class RequestSamples extends BaseComponent implements OnInit {
   }
 
   init() {
-    this.schemaPointer = JsonPointer.join(this.schemaPointer, 'schema');;
+    this.schemaPointer = this.schemaPointer ? JsonPointer.join(this.schemaPointer, 'schema') : null;
     this.samples = this.componentSchema['x-code-samples'] || [];
+    if (!this.schemaPointer && !this.samples.length) this.hidden = true;
   }
 
   ngOnInit() {