Ported UI improvements