New layouta, more fixing