Fix syntax errors that prevented links loading
Move controlbar to its own <nav>