Add @netcarver PR #457 (with some minor modifications) for new collapsed locked states with inputfields.