This is the horizontal table view
fixing merge conflicts