Nav: better logic for controls and sections
Revert local sbt