Further skinning and ux cleanup