Some design tweaks
Some design tweaks