Add hover/focus underline to button
Fix alignment issue when button text on 2 lines