xs screen fixes