Improved further layout mistakes