Added a better label and int for the Screen Properties
Modified labels and hints
Merge branch 'master' of https://github.com/entirej/rap