Design tweaks