revert menu merge issue + button height issue
Merge remote-tracking branch 'origin/develop-ui' into develop-ui