Aditional screen fixes