Design & layout improvements