diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewApp.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewApp.js
index 83e1906da1b..3965c506c63 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewApp.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewApp.js
@@ -218,7 +218,6 @@ class AddNewApp extends React.Component {
                                         <div>
                                             <Form labelAlign="left" layout="horizontal" className={styles.stepForm}
                                                   hideRequiredMark>
-
                                                 <Form.Item {...formItemLayout} label="Platform">
                                                     <Select placeholder="ex: android">
                                                         <Option value="Android">Android</Option>
@@ -234,7 +233,7 @@ class AddNewApp extends React.Component {
                                                     <Input placeholder="ex: Lorem App"/>
                                                 </Form.Item>
                                                 <Form.Item {...formItemLayout} label="Description">
-                                                    <TextArea placeholder="Enter the description..." rows={4}/>
+                                                    <TextArea placeholder="Enter the description..." rows={7}/>
                                                 </Form.Item>
                                                 <Form.Item {...formItemLayout} label="Category">
                                                     <Select placeholder="Select a category">
@@ -250,24 +249,34 @@ class AddNewApp extends React.Component {
                                                 </Form.Item>
                                                 <Divider/>
                                                 <Form.Item {...formItemLayout} label="Tags">
-                                                    <Select
-                                                        mode="tags"
-                                                        style={{ width: '100%' }}
-                                                        placeholder="Tags Mode"
-                                                    >
-                                                        {this.tags}
-                                                    </Select>,
+
+                                                    <InputGroup>
+                                                        <Row gutter={8}>
+                                                            <Col span={22}>
+                                                                <Select
+                                                                    mode="multiple"
+                                                                    style={{ width: '100%' }}
+                                                                    placeholder="Tags Mode"
+                                                                >
+                                                                    {this.tags}
+                                                                </Select>
+                                                            </Col>
+                                                            <Col span={2}>
+                                                                <Button type="dashed" shape="circle" icon="plus"/>
+                                                            </Col>
+                                                        </Row>
+                                                    </InputGroup>
                                                 </Form.Item>
                                                 <Form.Item {...formItemLayout} label="Meta Daa">
                                                     <InputGroup>
                                                         <Row gutter={8}>
-                                                            <Col span={5}>
+                                                            <Col span={10}>
                                                                 <Input placeholder="Key"/>
                                                             </Col>
-                                                            <Col span={10}>
+                                                            <Col span={12}>
                                                                 <Input placeholder="value"/>
                                                             </Col>
-                                                            <Col span={4}>
+                                                            <Col span={2}>
                                                                 <Button type="dashed" shape="circle" icon="plus"/>
                                                             </Col>
                                                         </Row>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/components/AddTagModal.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/components/AddTagModal.js
new file mode 100644
index 00000000000..c0644ec1492
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/components/AddTagModal.js
@@ -0,0 +1,49 @@
+import React from "react";
+import { Upload, Icon, Modal} from 'antd';
+
+
+class AddTagModal extends React.Component {
+    state = {
+        previewVisible: false,
+        previewImage: '',
+        fileList: [],
+    };
+
+    handleCancel = () => this.setState({ previewVisible: false });
+
+    handlePreview = (file) => {
+        this.setState({
+            previewImage: file.url || file.thumbUrl,
+            previewVisible: true,
+        });
+    };
+
+    handleChange = ({ fileList }) => this.setState({ fileList });
+
+    render() {
+        const { previewVisible, previewImage, fileList } = this.state;
+        const uploadButton = (
+            <div>
+                <Icon type="plus" />
+                <div className="ant-upload-text">Upload</div>
+            </div>
+        );
+        return (
+            <div className="clearfix">
+                <Upload
+                    action="//jsonplaceholder.typicode.com/posts/"
+                    listType="picture-card"
+                    fileList={fileList}
+                    onPreview={this.handlePreview}
+                    onChange={this.handleChange}
+                >
+                    {fileList.length >= 3 ? null : uploadButton}
+                </Upload>
+                <Modal visible={previewVisible} footer={null} onCancel={this.handleCancel}>
+                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
+                </Modal>
+            </div>
+        );
+    }
+}
+export default AddTagModal;
\ No newline at end of file