Minor cleanup in layout XML