add paddings in layouts
minor changes