Various design tweaks