Added more GUI-related stuff