Minor design tweaks.  Also hopefully now works correctly on touch devices