diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/repository/database/WSO2AM_DB.h2.db b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/repository/database/WSO2AM_DB.h2.db
index 060aa548c721..232f18ade291 100644
Binary files a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/repository/database/WSO2AM_DB.h2.db and b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/repository/database/WSO2AM_DB.h2.db differ
diff --git a/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/extensions/publisher/assets/api/themes/default/css/apim_common.css b/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/extensions/publisher/assets/api/themes/default/css/apim_common.css
index 0da8e835b9e7..1fc05cdde6e8 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/extensions/publisher/assets/api/themes/default/css/apim_common.css
+++ b/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/extensions/publisher/assets/api/themes/default/css/apim_common.css
@@ -3,7 +3,9 @@
 }
 #resource_url_pattern_refix {
     font-weight: bold;
+    float: left;
     font-size: 11px;
+    margin-left: 12px;
 }
 .multiselect-container{
     top:35px;
@@ -153,7 +155,7 @@ label {
     background-color: #1965b2;
 }
 .chk-lbe{width: 100px; float: left;}
-.margin-left-chk{margin-left: 79px;}
+.margin-left-chk{margin-left: 335px;}
 #add_resource{float: left;  margin-left: 15px;}
 .resource_url_pattern{height: 35px; border: 1px solid #cccccc; }
 
@@ -279,3 +281,11 @@ button.btn-api-del {
     background:url('../imgs/icons/ico-users.png') 0.8em 1em no-repeat;
 }
 
+.context-area {
+    display: table;
+    width: 100px;
+    height: 35px;
+    background: #b6bcbd;
+    padding-top: 11px;
+}
+
diff --git a/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/extensions/publisher/assets/api/themes/default/partials/common_api_template.hbs b/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/extensions/publisher/assets/api/themes/default/partials/common_api_template.hbs
index a3a1c049417e..a94031aae9e6 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/extensions/publisher/assets/api/themes/default/partials/common_api_template.hbs
+++ b/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/extensions/publisher/assets/api/themes/default/partials/common_api_template.hbs
@@ -270,7 +270,7 @@
             <a  href="#wsdlUpload" role="button" class="btn pull-right" data-toggle="modal" ><i class="icon-download-alt" ></i> {{t "Import"}} </a>
             <legend>{{t "API Definition "}}</legend>
             <div class="control-group api_wsdl">
-                <label class="control-label" for="wsdl">{{t "WSDL"}}:</label>
+                <label class="control-label custom-form-label col-lg-2" for="wsdl">{{t "WSDL"}}:</label>
                 <div class="controls">
                 <div class="input-append">
                 <input type="text" class="input-xlarge validInput" id="wsdl" name="wsdl"  value="{{apiMetaData.wsdl}}" />
@@ -287,7 +287,7 @@
 				<a  href="#wsdlUpload" role="button" class="btn pull-right" data-toggle="modal" ><i class="icon-download-alt" ></i> {{t "Import"}} </a>
 				<legend>{{t "API Definition "}}</legend>
 			<div class="control-group api_wsdl">
-				<label class="control-label" for="wsdl">{{t "WSDL"}}:</label>
+				<label class="control-label custom-form-label col-lg-2" for="wsdl">{{t "WSDL"}}:</label>
 				<div class="controls">
 					<div class="input-append">
 						<input type="text" class="input-xlarge validInput" id="wsdl" name="wsdl"  value="{{api.wsdl}}" />
@@ -305,13 +305,13 @@
 						<legend>API Definition</legend>
 						<div class="resource_create">
 							<div class="control-group">
-								<label class="control-label" for="inputPassword">URL Pattern</label>
+								<label class="control-label custom-form-label col-lg-2" for="inputPassword">URL Pattern</label>
 								<div class="controls">
 									<div class="input-prepend">
 										{{#if api}}
 											<span class="add-on" id="resource_url_pattern_refix">{{api.context}}</span>
 										{{else}}
-											<span class="add-on" id="resource_url_pattern_refix">/{context}/{version}/</span>
+											<span class="context-area add-on" id="resource_url_pattern_refix">/{context}/{version}/</span>
 										{{/if}}
 										<input style="width:500px" id="resource_url_pattern" type="text" placeholder="Url Pattern Ex: path/to/resource" class="resource_url_pattern"/>
 									</div>
@@ -331,13 +331,13 @@
 						<legend>API Definition</legend>
 						<div class="resource_create">
 							<div class="control-group">
-								<label class="control-label" for="inputPassword">URL Pattern</label>
+								<label class="control-label custom-form-label col-lg-2" for="inputPassword">URL Pattern</label>
 								<div class="controls">
 									<div class="input-prepend">
 										{{#if api}}
 											<span class="add-on" id="resource_url_pattern_refix">{{api.context}}</span>
 										{{else}}
-											<span class="add-on" id="resource_url_pattern_refix">/{context}/{version}/</span>
+											<span class="context-area add-on" id="resource_url_pattern_refix">/{context}/{version}/</span>
 										{{/if}}
 										<input style="width:500px" id="resource_url_pattern" type="text" placeholder="Url Pattern Ex: path/to/resource" class="resource_url_pattern"/>
 									</div>