A few design tweaks