Android layout cleanup