diff --git a/includes/gateways/class-wc-payment-gateway-cc.php b/includes/gateways/class-wc-payment-gateway-cc.php
index 642cd643ae778..e560efed26e20 100644
--- a/includes/gateways/class-wc-payment-gateway-cc.php
+++ b/includes/gateways/class-wc-payment-gateway-cc.php
@@ -10,7 +10,7 @@
  * @package		WooCommerce/Classes
  * @author 		WooThemes
  */
-class WC_Payment_Gateway_CC extends WC_Payment_Gateway {
+abstract class WC_Payment_Gateway_CC extends WC_Payment_Gateway {
 
 	/**
 	 * Builds our payment fields area - including tokenization fields and the actualy payment fields.
@@ -42,9 +42,8 @@ public function payment_fields() {
 	public function form() {
 		$html           = '';
 		$fields         = array();
-		$cvc_class      = '';
 
-		$cvc_field = '<p class="form-row form-row-wide">
+		$cvc_field = '<p class="form-row form-row-last">
 			<label for="' . esc_attr( $this->id ) . '-card-cvc">' . __( 'Card Code', 'woocommerce' ) . ' <span class="required">*</span></label>
 			<input id="' . esc_attr( $this->id ) . '-card-cvc" class="input-text wc-credit-card-form-card-cvc" type="text" autocomplete="off" placeholder="' . esc_attr__( 'CVC', 'woocommerce' ) . '" name="' . esc_attr( $this->id ) . '-card-cvc" style="width:100px" />
 		</p>';
diff --git a/includes/gateways/class-wc-payment-gateway-echeck.php b/includes/gateways/class-wc-payment-gateway-echeck.php
index d69aac55e7339..a5ab6b446e831 100644
--- a/includes/gateways/class-wc-payment-gateway-echeck.php
+++ b/includes/gateways/class-wc-payment-gateway-echeck.php
@@ -10,7 +10,7 @@
  * @package		WooCommerce/Classes
  * @author 		WooThemes
  */
-class WC_Payment_Gateway_eCheck extends WC_Payment_Gateway {
+abstract class WC_Payment_Gateway_eCheck extends WC_Payment_Gateway {
 
 	/**
 	 * Builds our payment fields area - including tokenization fields and the actualy payment fields.
diff --git a/templates/myaccount/payment-methods.php b/templates/myaccount/payment-methods.php
index 7182ca02514d6..dd955e882a870 100644
--- a/templates/myaccount/payment-methods.php
+++ b/templates/myaccount/payment-methods.php
@@ -44,11 +44,6 @@
 				</tr>
 			</thead>
 			<?php foreach ( $saved_methods as $type => $methods ) : ?>
-				<tr>
-					<th colspan='3'>
-					<?php echo esc_html( $types[ $type ] );?>
-					</th>
-				</tr>
 				<?php foreach ( $methods as $method ) : ?>
 					<tr class="method">
 						<?php foreach ( wc_get_account_payment_methods_columns() as $column_id => $column_name ) : ?>
@@ -85,6 +80,6 @@
 
 	<?php do_action( 'woocommerce_after_account_payment_methods', $has_methods ); ?>
 
-	<a class="button" href="<?php echo esc_url( wc_get_endpoint_url( 'add-payment-method' ) ); ?>"><?php esc_html_e( 'Add New Payment Method', 'woocommerce' ); ?></a>
+	<a class="button" href="<?php echo esc_url( wc_get_endpoint_url( 'add-payment-method' ) ); ?>"><?php esc_html_e( 'Add Payment Method', 'woocommerce' ); ?></a>
 
 </div>