Tweaked form design some more