Fixed layout issues- Some warnings at runtime regarding contraint

collisoins that need to be fixed