Added Tables and Cleaned up Code

Added tables as one of the options to display the data, users can now
select to see their data in graphic form or tabular form.