[#87] Start figuring out button focus
[#87] Fix form margin/padding