Minor btn layout improvements