Few fixes to property cell panels