xml layout cleanup