Some various small design tweaks