unifrom layouts, better version : small bugs