minor ui rearrangements