more reworking of layout etc