move some more ui into xml