CBD-1217:  better widget alignment

Change-Id: I0b6729e65ee136dbf035b8830a04df984b06840b
Reviewed-on: http://review.couchbase.org/33143
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>