Fixed some of the issue with button groups and input prepend and append