Fixed some layoutes