diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js
index 1a0ac43127c..36b5d4e79ba 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js
@@ -344,7 +344,7 @@ class NewAppDetailsForm extends React.Component {
                                     banner
                                     closable/>
                             )}
-                            <Form.Item {...formItemLayout} label="Unrestricted Roles">
+                            <Form.Item {...formItemLayout} label="Visible Roles">
                                 {getFieldDecorator('unrestrictedRoles', {
                                     rules: [],
                                     initialValue: []
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js
index 5667cf3b9be..7222fe53947 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js
@@ -24,7 +24,7 @@ import {withConfigContext} from "../../context/ConfigContext";
 import {handleApiError} from "../../js/Utils";
 import InfiniteScroll from "react-infinite-scroller";
 
-const limit = 10;
+const limit = 30;
 
 class AppList extends React.Component {
     constructor(props) {
@@ -44,7 +44,7 @@ class AppList extends React.Component {
     componentDidMount() {
         const {deviceType} = this.props;
         this.props.changeSelectedMenuItem(deviceType);
-        this.fetchData(0, limit, res => {
+        this.fetchData(0, 30, res => {
             this.setState({
                 apps: res,
                 loading: false
@@ -57,7 +57,13 @@ class AppList extends React.Component {
         if (prevProps.deviceType !== this.props.deviceType) {
             const {deviceType} = this.props;
             this.props.changeSelectedMenuItem(deviceType);
-            this.fetchData(deviceType);
+            this.fetchData(0, 30, res => {
+                this.setState({
+                    apps: res,
+                    loading: false,
+                    hasMore: true
+                });
+            });
         }
     }
 
@@ -134,6 +140,7 @@ class AppList extends React.Component {
         return (
             <div>
                 <InfiniteScroll
+                    key={this.props.deviceType}
                     initialLoad={false}
                     pageStart={0}
                     loadMore={this.handleInfiniteOnLoad}