Merge remote-tracking branch 'upstream/develop' into develop

margin-top added to buttons to enable button to drop down at smaller column with a gap