small changes to Layout