Improved Nav and Tables