Merge of ScreenManager with master branch, addresses Dean's string related comments