Code adjusmtents & layout improvements