text formating change for displays in menu
quick fix for wigets with spaces in their name
Fixed issue with incorrect screen being marked.

Also refactored a bit for clarity
getting screen names the non deprecated way