Tweak UI to suit new server-side (API) creation