Layout enhancements and logic changes