Fixed problem with redraw of main screen