Adding more design tweaks