Hack to make sure nav works properly

- Will change this later