added nav, tool, buttons