Some design touch-ups