minor fixes

Fixed navigator moving when focus
Removed some dead code
Reuse layout for result tables