code & layout improvements