Fixed issues with GUI crashing (Red X)