Tweaks to design on narrow width