Major update - rebuilt nav model and homepage