Some adjustment for `name` layout and adjust some padding