fixed some lay-out issues