Jack's UI changes