minor layout changes... untested :(