Refactored tool nav
pkg