untracked
merge with math
removed top navi routing and fixed interaction