better layout; refs #3