Some changes for the new gui