Removed click to edit and added nulls