More SMP UI improvements (still incomplete)