Initial redesign. Basic layout mostly complete