Merge with Roberto's changes 
Disable screen when inactive