Move es module into right place and fix topnav