Fixes to allow for flexible desktop and workspace configuration
Further fixes for flexible layout