some more android ux cleanup