add nav
load data for nav
small refactory