Issue #210: some fixes to get large screen up