Fixed some screen errors