Got enough of the logic nailed down that it's time to start cleaning up the layout.