Got rid of dynamic nav bar and useless tables in schema again 2