Cell fixes + add Place class