Really awful workaround for nav for now..

Really awful workaround for nav for now..