bug #8 resolved, minor layout fixes