UI: Update, now looking more like vanilla