Update InputPage to use ExpandGroup and not my own implementation of what is pretty much the same thing