Some changes that I needed for the Editor Screen Bundle