Make layout a little more robust.

 * Remove a lot of unnecessary "height" properties
 * Improve display of buttons