Various design tweaks...