Format fix for newly found buttons, other misc fixes.