More design tweaks