More updates.
Initial rough layout.