big changes to mockup based on S. Lewis UI discussions