fix topbar links, added grunt watch