nav tabs fix
Merged 'dev'.
Finish repair-tests