diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js
index eba53ee7934..aaa760844a3 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js
@@ -118,7 +118,6 @@ class FiltersForm extends React.Component {
         });
     };
 
-
     render() {
         const {categories, tags, deviceTypes} = this.state;
         const {getFieldDecorator} = this.props.form;
@@ -148,10 +147,7 @@ class FiltersForm extends React.Component {
                             </Form.Item>
                         </Col>
                     </Row>
-                    <Divider/>
 
-                    {/*<Text strong={true}>Category</Text>*/}
-                    {/*<br/><br/>*/}
                     <Form.Item label="Categories">
                         {getFieldDecorator('categories', {
                             rules: [{
@@ -178,15 +174,7 @@ class FiltersForm extends React.Component {
                             </Select>
                         )}
                     </Form.Item>
-                    {/*<Select*/}
-                    {/*mode="multiple"*/}
-                    {/*style={{width: '100%'}}*/}
-                    {/*placeholder="All Categories"*/}
-                    {/*>*/}
-                    {/*<Option key={1}>IoT</Option>*/}
-                    {/*<Option key={2}>EMM</Option>*/}
-                    {/*</Select>*/}
-                    <Divider/>
+
 
                     <Form.Item label="Device Types">
                         {getFieldDecorator('deviceTypes', {
@@ -213,7 +201,6 @@ class FiltersForm extends React.Component {
                         )}
                     </Form.Item>
 
-                    {/*<Text strong={true}>Tags</Text>*/}
                     <Form.Item label="Tags">
                         {getFieldDecorator('tags', {
                             rules: [{
@@ -240,7 +227,6 @@ class FiltersForm extends React.Component {
                         )}
                     </Form.Item>
 
-                    <Divider/>
                     <Form.Item label="App Type">
                         {getFieldDecorator('appType', {})(
                             <Select
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.js
index ce3c10d81cb..898b67496f7 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.js
@@ -20,7 +20,7 @@ class App extends React.Component {
             <Router>
                 <div>
                     <Switch>
-                        <Redirect exact from="/store" to="/store/apps"/>
+                        <Redirect exact from="/store" to="/store/android"/>
                         {this.routes.map((route) => (
                             <RouteWithSubRoutes key={route.path} {...route} />
                         ))}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js
index 367dfd7a31f..affc3da6908 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js
@@ -9,6 +9,7 @@ import AddReview from "./review/AddReview";
 import axios from "axios";
 import config from "../../../../public/conf/config.json";
 import AppInstallModal from "./install/AppInstallModal";
+import CurrentUsersReview from "./review/CurrentUsersReview";
 
 const {Title, Text, Paragraph} = Typography;
 
@@ -129,14 +130,13 @@ class ReleaseView extends React.Component {
                         {release.description}
                     </Paragraph>
                     <Divider/>
+                    <CurrentUsersReview uuid={release.uuid}/>
+                    <Divider dashed={true}/>
                     <Text>REVIEWS</Text>
                     <Row>
-                        <Col lg={18}>
+                        <Col lg={18} md={24}>
                             <DetailedRating type="app" uuid={release.uuid}/>
                         </Col>
-                        <Col lg={6}>
-                            <AddReview uuid={release.uuid}/>
-                        </Col>
                     </Row>
                     <Reviews type="app" uuid={release.uuid}/>
                 </div>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/AddReview.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/AddReview.js
index 5d666e1a5db..7c1dd36c18e 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/AddReview.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/AddReview.js
@@ -1,5 +1,5 @@
 import React from "react";
-import {Drawer, Button, Icon, Row, Col, Typography, Divider, Input,Spin,notification} from 'antd';
+import {Drawer, Button, Icon, Row, Col, Typography, Divider, Input, Spin, notification} from 'antd';
 import StarRatings from "react-star-ratings";
 import axios from "axios";
 import config from "../../../../../public/conf/config.json";
@@ -52,12 +52,10 @@ class AddReview extends React.Component {
             rating: rating
         };
 
-        const request = "method=post&content-type=application/json&payload="+JSON.stringify(payload)+"&api-endpoint=/application-mgt-store/v1.0/reviews/"+uuid;
-
         axios.post(
-            config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.store+"/reviews/"+uuid,
+            config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.store + "/reviews/" + uuid,
             payload,
-            ).then(res => {
+        ).then(res => {
             if (res.status === 201) {
                 this.setState({
                     loading: false,
@@ -69,10 +67,10 @@ class AddReview extends React.Component {
                         'Your review has been posted successfully.',
                 });
 
-                setTimeout(()=>{
-                    window.location.href= uuid;
-                },2000)
-            }else{
+                setTimeout(() => {
+                    window.location.href = uuid;
+                }, 2000)
+            } else {
                 this.setState({
                     loading: false,
                     visible: false
@@ -84,10 +82,10 @@ class AddReview extends React.Component {
                 });
             }
 
-        }).catch((error) =>{
+        }).catch((error) => {
             if (error.response.status === 401) {
-                window.location.href = config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort+'/store/login';
-            } else{
+                window.location.href = config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + '/store/login';
+            } else {
                 this.setState({
                     loading: false,
                     visible: false
@@ -105,8 +103,8 @@ class AddReview extends React.Component {
 
     render() {
         return (
-            <div style={{paddingTop: 20}}>
-                <Button style={{float: "right"}} type="dashed" onClick={this.showDrawer}>
+            <div>
+                <Button type="primary" onClick={this.showDrawer}>
                     <Icon type="star"/> Add a review
                 </Button>
 
@@ -119,37 +117,37 @@ class AddReview extends React.Component {
                     height={400}
                 >
                     <Spin spinning={this.state.loading} tip="Posting your review...">
-                    <Row>
-                        <Col lg={8}/>
-                        <Col lg={8}>
-                            <Title level={4}>Add review</Title>
-                            <Divider/>
-                            <TextArea
-                                placeholder="Tell others what you think about this app. Would you recommend it, and why?"
-                                onChange={this.onChange}
-                                autosize={{minRows: 6, maxRows: 12}}
-                                value={this.state.content || ''}
-                                style={{marginBottom: 20}}
-                            />
-                            <StarRatings
-                                rating={this.state.rating}
-                                changeRating={this.changeRating}
-                                starRatedColor="#777"
-                                starHoverColor="#444"
-                                starDimension="20px"
-                                starSpacing="2px"
-                                numberOfStars={5}
-                                name='rating'
-                            />
-                            <br/><br/>
-                            <Button onClick={this.onClose} style={{marginRight: 8}}>
-                                Cancel
-                            </Button>
-                            <Button disabled={this.state.rating===0} onClick={this.onSubmit} type="primary">
-                                Submit
-                            </Button>
-                        </Col>
-                    </Row>
+                        <Row>
+                            <Col lg={8}/>
+                            <Col lg={8}>
+                                <Title level={4}>Add review</Title>
+                                <Divider/>
+                                <TextArea
+                                    placeholder="Tell others what you think about this app. Would you recommend it, and why?"
+                                    onChange={this.onChange}
+                                    rows={4}
+                                    value={this.state.content || ''}
+                                    style={{marginBottom: 20}}
+                                />
+                                <StarRatings
+                                    rating={this.state.rating}
+                                    changeRating={this.changeRating}
+                                    starRatedColor="#777"
+                                    starHoverColor="#444"
+                                    starDimension="20px"
+                                    starSpacing="2px"
+                                    numberOfStars={5}
+                                    name='rating'
+                                />
+                                <br/><br/>
+                                <Button onClick={this.onClose} style={{marginRight: 8}}>
+                                    Cancel
+                                </Button>
+                                <Button disabled={this.state.rating === 0} onClick={this.onSubmit} type="primary">
+                                    Submit
+                                </Button>
+                            </Col>
+                        </Row>
                     </Spin>
                 </Drawer>
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/CurrentUsersReview.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/CurrentUsersReview.js
new file mode 100644
index 00000000000..eca40fc60e9
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/CurrentUsersReview.js
@@ -0,0 +1,95 @@
+import React from "react";
+import {List, message, Typography, Empty, Button, Row, Col} from "antd";
+import SingleReview from "./singleReview/SingleReview";
+import axios from "axios";
+import config from "../../../../../public/conf/config.json";
+import AddReview from "./AddReview";
+
+const {Text, Paragraph} = Typography;
+
+class CurrentUsersReview extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.state = {
+            data: []
+
+        };
+    }
+
+    componentDidMount() {
+        this.fetchData();
+    }
+
+    fetchData = () => {
+        const {uuid} = this.props;
+
+        axios.get(
+            config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.store + "/reviews/app/user/" + uuid,
+        ).then(res => {
+            if (res.status === 200) {
+                const data = res.data.data.data;
+                this.setState({data});
+            }
+
+        }).catch((error) => {
+            if (error.response.hasOwnProperty(status) && error.response.status === 401) {
+                message.error('You are not logged in');
+                window.location.href = config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + '/store/login';
+            } else {
+                message.error('Something went wrong when trying to get your review... :(');
+            }
+        });
+    };
+
+
+    render() {
+        const {data} = this.state;
+        const {uuid} = this.props;
+        return (
+            <div>
+                <Text>MY REVIEW</Text>
+                <div style={{
+                    overflow: "auto",
+                    paddingTop: 8,
+                    paddingLeft: 24
+                }}>
+                    {data.length > 0 && (
+                        <div>
+                            <List
+                                dataSource={data}
+                                renderItem={item => (
+                                    <List.Item key={item.id}>
+                                        <SingleReview uuid={uuid} review={item} isDeletable={true} isEditable={true}/>
+                                    </List.Item>
+                                )}
+                            >
+                            </List>
+                        </div>
+                    )}
+
+                    {data.length === 0 && (
+                        <div>
+                            <Empty
+                                image={Empty.PRESENTED_IMAGE_DEFAULT}
+                                imagestyle={{
+                                    height: 60,
+                                }}
+                                description={
+                                    <span>Share your experience with your community by adding a review.</span>
+                                }
+                            >
+                                {/*<Button type="primary">Add review</Button>*/}
+                                <AddReview uuid={uuid}/>
+                            </Empty>
+                        </div>
+                    )}
+
+                </div>
+            </div>
+        );
+    }
+
+}
+
+export default CurrentUsersReview;
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.css
index f77c5a31376..2f93bd74f4f 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.css
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.css
@@ -1,23 +1,16 @@
-.demo-infinite-container {
+.infinite-container {
     overflow: auto;
     padding: 8px 24px;
 }
-.demo-loading-container {
+.loading-container {
     position: absolute;
     bottom: 40px;
     width: 100%;
     text-align: center;
 }
 
-.demo-loading {
+.loading {
     position: absolute;
     bottom: -40px;
     left: 50%;
-}
-
-img.twemoji {
-    height: 1em;
-    width: 1em;
-    margin: 0 .05em 0 .1em;
-    vertical-align: -0.1em;
 }
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.js
index db2b69c52df..c01a859c6a1 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.js
@@ -3,7 +3,7 @@ import {List, message, Avatar, Spin, Button} from 'antd';
 import "./Reviews.css";
 
 import InfiniteScroll from 'react-infinite-scroller';
-import SingleReview from "./SingleReview";
+import SingleReview from "./singleReview/SingleReview";
 import axios from "axios";
 import config from "../../../../../public/conf/config.json";
 
@@ -87,43 +87,33 @@ class Reviews extends React.Component {
     };
 
     render() {
-        const review = {
-            id: 2,
-            content: "Btw, it was clear to me that I can cancel the 1 year subscription before the free trial week and so I did. Dont understand the negative reviews about that. It has a good collection of excercises, meditations etc. You just answer 5 questions and you get challenges assigned to you. I would have liked something even more personalized. I didnt like the interface. It is a bit messy and difficult to follow your tasks. So, I didnt want to do a full-year subscription. There could be more options.",
-            rootParentI: -1,
-            immediateParentId: -1,
-            createdAt: "Fri, 24 May 2019 17:27:22 IST",
-            modifiedAt: "Fri, 24 May 2019 17:27:22 IST",
-            rating: 4,
-            replies: []
-        };
-        // console.log(this.state.loadMore);
-        // console.log(this.state.data.length);
+        const {loading, hasMore, data, loadMore} = this.state;
+        const {uuid} = this.props;
         return (
-            <div className="demo-infinite-container">
+            <div className="infinite-container">
                 <InfiniteScroll
                     initialLoad={false}
                     pageStart={0}
                     loadMore={this.handleInfiniteOnLoad}
-                    hasMore={!this.state.loading && this.state.hasMore}
+                    hasMore={!loading && hasMore}
                     useWindow={true}
                 >
                     <List
-                        dataSource={this.state.data}
+                        dataSource={data}
                         renderItem={item => (
                             <List.Item key={item.id}>
-                                <SingleReview review={item}/>
+                                <SingleReview uuid={uuid} review={item} isDeletable={true} isEditable={false}/>
                             </List.Item>
                         )}
                     >
-                        {this.state.loading && this.state.hasMore && (
-                            <div className="demo-loading-container">
+                        {loading && hasMore && (
+                            <div className="loading-container">
                                 <Spin/>
                             </div>
                         )}
                     </List>
                 </InfiniteScroll>
-                {!this.state.loadMore && (this.state.data.length >= limit) && (<div style={{textAlign: "center"}}>
+                {!loadMore && (data.length >= limit) && (<div style={{textAlign: "center"}}>
                     <Button type="dashed" htmlType="button" onClick={this.enableLoading}>Read All Reviews</Button>
                 </div>)}
             </div>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/SingleReview.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/SingleReview.js
deleted file mode 100644
index d76bb00ed26..00000000000
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/SingleReview.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from "react";
-import {Avatar} from "antd";
-import {List, Typography} from "antd";
-import StarRatings from "react-star-ratings";
-import Twemoji from "react-twemoji";
-import "./Reviews.css";
-
-const {Text, Paragraph} = Typography;
-const colorList = ['#f0932b', '#badc58', '#6ab04c', '#eb4d4b', '#0abde3', '#9b59b6', '#3498db', '#22a6b3'];
-
-class SingleReview extends React.Component {
-
-    render() {
-        const review = this.props.review;
-        const randomColor = colorList[Math.floor(Math.random() * (colorList.length))];
-        const avatarLetter = review.username.charAt(0).toUpperCase();
-        const content = (
-            <div style={{marginTop: -5}}>
-                <StarRatings
-                    rating={review.rating}
-                    starRatedColor="#777"
-                    starDimension="12px"
-                    starSpacing="2px"
-                    numberOfStars={5}
-                    name='rating'
-                />
-                <Text style={{fontSize: 12, color: "#aaa"}} type="secondary"> {review.createdAt}</Text><br/>
-                <Twemoji options={{className: 'twemoji'}}>
-                    <Paragraph ellipsis={{rows: 3, expandable: true}} style={{color: "#777"}}>
-                        {review.content}
-                    </Paragraph>
-                </Twemoji>
-            </div>
-        );
-
-        return (
-            <div>
-                <List.Item.Meta
-                    avatar={
-                        <Avatar style={{backgroundColor: randomColor, verticalAlign: 'middle'}} size="large">
-                            {avatarLetter}
-                        </Avatar>
-                    }
-                    title={review.username}
-                    description={content}
-                />
-            </div>
-        );
-    }
-}
-
-export default SingleReview;
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/SingleReview.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/SingleReview.css
new file mode 100644
index 00000000000..7bdb6e5d2cb
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/SingleReview.css
@@ -0,0 +1,26 @@
+img.twemoji {
+    height: 1em;
+    width: 1em;
+    margin: 0 .05em 0 .1em;
+    vertical-align: -0.1em;
+}
+
+.edit-button {
+    color: #1890ff;
+    text-decoration: none;
+    outline: none;
+    cursor: pointer;
+    font-weight: normal;
+    font-size: 0.8em;
+    padding-left: 5px;
+}
+
+.delete-button {
+    color: #e74c3c;
+    text-decoration: none;
+    outline: none;
+    cursor: pointer;
+    font-weight: normal;
+    font-size: 0.8em;
+    padding-left: 5px;
+}
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/SingleReview.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/SingleReview.js
new file mode 100644
index 00000000000..8ca58208588
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/SingleReview.js
@@ -0,0 +1,90 @@
+import React from "react";
+import {Avatar} from "antd";
+import {List, Typography} from "antd";
+import StarRatings from "react-star-ratings";
+import Twemoji from "react-twemoji";
+import "./SingleReview.css";
+import EditReview from "./editReview/EditReview";
+
+const {Text, Paragraph} = Typography;
+const colorList = ['#f0932b', '#badc58', '#6ab04c', '#eb4d4b', '#0abde3', '#9b59b6', '#3498db', '#22a6b3','#e84393','#f9ca24'];
+
+class SingleReview extends React.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            content: '',
+            rating: 0,
+            color: '#f0932b'
+        }
+    }
+
+    componentDidMount() {
+        const {content, rating, username} = this.props.review;
+        const color = colorList[username.length%10];
+        this.setState({
+            content,
+            rating,
+            color
+        });
+    }
+
+
+    updateCallback = (response) =>{
+        console.log(response);
+        const {rating, content} = response;
+        this.setState({
+            rating,
+            content
+        });
+    };
+
+    render() {
+        const {review, isEditable, isDeletable, uuid} = this.props;
+        const {content, rating, color} = this.state;
+        const {username} = review;
+        const avatarLetter = username.charAt(0).toUpperCase();
+        const body = (
+            <div style={{marginTop: -5}}>
+                <StarRatings
+                    rating={rating}
+                    starRatedColor="#777"
+                    starDimension="12px"
+                    starSpacing="2px"
+                    numberOfStars={5}
+                    name='rating'
+                />
+                <Text style={{fontSize: 12, color: "#aaa"}} type="secondary"> {review.createdAt}</Text><br/>
+                    <Paragraph style={{color: "#777"}}>
+                        <Twemoji options={{className: 'twemoji'}}>
+                            {content}
+                        </Twemoji>
+                    </Paragraph>
+            </div>
+        );
+
+        const title = (
+            <div>
+            {review.username}
+                {isEditable && (<EditReview uuid={uuid} review={review} updateCallback={this.updateCallback}/>)}
+                {isDeletable && (<span className="delete-button">delete</span>)}
+            </div>
+        );
+
+        return (
+            <div>
+                <List.Item.Meta
+                    avatar={
+                        <Avatar style={{backgroundColor: color, verticalAlign: 'middle'}} size="large">
+                            {avatarLetter}
+                        </Avatar>
+                    }
+                    title={title}
+                    description={body}
+                />
+            </div>
+        );
+    }
+}
+
+export default SingleReview;
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/editReview/EditReview.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/editReview/EditReview.css
new file mode 100644
index 00000000000..d4d0955a757
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/editReview/EditReview.css
@@ -0,0 +1,9 @@
+.edit-button {
+    color: #1890ff;
+    text-decoration: none;
+    outline: none;
+    cursor: pointer;
+    font-weight: normal;
+    font-size: 0.8em;
+    padding-left: 5px;
+}
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/editReview/EditReview.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/editReview/EditReview.js
new file mode 100644
index 00000000000..3a2af32e915
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/editReview/EditReview.js
@@ -0,0 +1,170 @@
+import React from "react";
+import {Drawer, Button, Icon, Row, Col, Typography, Divider, Input, Spin, notification} from 'antd';
+import StarRatings from "react-star-ratings";
+import axios from "axios";
+import config from "../../../../../../../public/conf/config.json";
+import "./EditReview.css";
+
+const {Title} = Typography;
+const {TextArea} = Input;
+
+class EditReview extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.state = {
+            visible: false,
+            content: '',
+            rating: 0,
+            loading: false
+        };
+    }
+
+    componentDidMount() {
+        const {content,rating,id} = this.props.review;
+        console.log(this.props.review);
+        this.setState({
+            content,
+            rating
+        });
+    }
+
+    showDrawer = () => {
+        this.setState({
+            visible: true,
+            loading: false
+        });
+    };
+
+    onClose = () => {
+        this.setState({
+            visible: false,
+
+        });
+    };
+
+    changeRating = (newRating, name) => {
+        this.setState({
+            rating: newRating
+        });
+    };
+
+    onChange = (e) => {
+        this.setState({content: e.target.value})
+    };
+
+    onSubmit = () => {
+        const {content, rating} = this.state;
+        const {id} = this.props.review;
+        const {uuid} = this.props;
+        this.setState({
+            loading: true
+        });
+
+        const payload = {
+            content: content,
+            rating: rating
+        };
+
+        axios.put(
+            config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.store + "/reviews/" + uuid+"/"+id,
+            payload,
+        ).then(res => {
+            if (res.status === 200) {
+                this.setState({
+                    loading: false,
+                    visible: false
+                });
+                notification["success"]({
+                    message: 'Done!',
+                    description:
+                        'Your review has been update successfully.',
+                });
+
+                this.props.updateCallback(res.data.data);
+            } else {
+                this.setState({
+                    loading: false,
+                    visible: false
+                });
+                notification["error"]({
+                    message: 'Something went wrong',
+                    description:
+                        "We are unable to update your review right now.",
+                });
+            }
+
+        }).catch((error) => {
+            console.log(error);
+            if (error.hasOwnProperty("response") && error.response.status === 401) {
+                window.location.href = config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + '/store/login';
+            } else {
+                this.setState({
+                    loading: false,
+                    visible: false
+                });
+                notification["error"]({
+                    message: 'Something went wrong',
+                    description:
+                        "We are unable to add your review right now.",
+                });
+            }
+        });
+
+
+    };
+
+    render() {
+        return (
+            <span>
+                <span className="edit-button" onClick={this.showDrawer}>edit</span>
+                <Drawer
+                    // title="Basic Drawer"
+                    placement="bottom"
+                    closable={false}
+                    onClose={this.onClose}
+                    visible={this.state.visible}
+                    height={400}
+                >
+                    <Spin spinning={this.state.loading} tip="Posting your review...">
+                        <Row>
+                            <Col lg={8}/>
+                            <Col lg={8}>
+                                <Title level={4}>Edit review</Title>
+                                <Divider/>
+                                <TextArea
+                                    placeholder="Tell others what you think about this app. Would you recommend it, and why?"
+                                    onChange={this.onChange}
+                                    rows={6}
+                                    value={this.state.content || ''}
+                                    style={{marginBottom: 20}}
+                                />
+                                <StarRatings
+                                    rating={this.state.rating}
+                                    changeRating={this.changeRating}
+                                    starRatedColor="#777"
+                                    starHoverColor="#444"
+                                    starDimension="20px"
+                                    starSpacing="2px"
+                                    numberOfStars={5}
+                                    name='rating'
+                                />
+                                <br/><br/>
+                                <Button onClick={this.onClose} style={{marginRight: 8}}>
+                                    Cancel
+                                </Button>
+                                <Button disabled={this.state.rating === 0} onClick={this.onSubmit} type="primary">
+                                    Submit
+                                </Button>
+                            </Col>
+                        </Row>
+                    </Spin>
+                </Drawer>
+
+
+            </span>
+        );
+    }
+}
+
+export default EditReview;
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.js
index 71bae0e7927..fbdb202364d 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.js
@@ -68,7 +68,7 @@ class NormalLoginForm extends React.Component {
                 axios.post(config.serverConfig.protocol + "://"+config.serverConfig.hostname+':'+config.serverConfig.httpsPort+config.serverConfig.loginUri, request
                 ).then(res => {
                     if (res.status === 200) {
-                        window.location = res.data.url;
+                        window.location = config.serverConfig.protocol + "://"+config.serverConfig.hostname+':'+config.serverConfig.httpsPort+"/store";
                     }
                 }).catch(function (error) {
                     if (error.response.status === 400) {
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js
index 2a2a1dd0ff4..55c99248581 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js
@@ -48,7 +48,6 @@ class Dashboard extends React.Component {
                 <Layout>
                     <Content style={{padding: '0 0'}}>
                         <Switch>
-                            <Redirect exact from="/store" to="/store/android"/>
                             {this.state.routes.map((route) => (
                                 <RouteWithSubRoutes changeSelectedMenuItem={this.changeSelectedMenuItem} key={route.path} {...route} />
                             ))}