Styling of padding on buttons, and user and search in header
Merge