Changed up switch/table layout and fixed add flow bug