padding in the li made smaller by taking margin off and adding padding
Merge remote-tracking branch 'upstream/develop' into develop

padding on the li made smaller