Touchups/fixes for new, simpler design.