Fix keyType layout and space out buttons a bit

Change-Id: Idd46bb2ada1ff7ac934d5e20faee97842a990102