Some code cleanup, touch/non-touch gutter, little design/alignment tweaks