Update problem solved and adapted for all screens