Client: More UI layout work (#96)