Fix button alignment and warning.