Various Display Screen fixes. Closes ##1137.