Update cell constraints to be clearer