Added use of SingleWindow for when only one screen is used