Increased size of DataTables to 20
Code Cleanup - getting rid of tabs
More code cleanup
More code cleanup