made layout more flexible