Override line height properly
Fix markup for disabling buttons