Move tab-bar to partial like top-bar and off-canvas
Handle extra hyphen in 825e603