Reworked the main table menu