Tweak design a bit, taking into account user feedback