Buttons appear only when needed and other layout improvements.