Improvements resolving binary variables
Layout changes