Fixing minor UI bugs
Merge branch 'master' of github.com:wso2/enterprise-store
Merge remote-tracking branch 'upstream/master'