Added separate tabs for grid and table view. Addresses issue #134