fixed some layoutes