Add support for input groups and help text