Working on moving all the links form the main menu so that we don't have to confuse the user with too many options