changed legacy code to use new Screen Infrastructure, removed many
warnings