Improve paid status display
Merge branch 'develop'