JS bugfix, better nav