Fixed bug with initial display
Merge branch 'ToggleButtons' into nps-identity