Finish Sunday's work

Fine tuned some of the screens