Clean-up group navigation.
Misc