More design tweaks from carolyn