Fixed a bug in a few screens