Client Build/Redesign

@sheyla Oh, bugger! But Thanks! Appreciate your quick responses.