improved layout, added global support, untested