Added height to buttons and inputs to keep a linear height.
Merge branch 'develop'