Added object associations
Cleaned up layout constraint checker