Nav is fixed for the moment. Going to work on re-doing it tonight