switched plan view to a table view
merge conflicts