Fixed minor bug introduced with error macros;
Moved variables from globals.c to display.c