Code clean, layout improvements